Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 13:49:46 +0000 (14:49 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 27 Feb 2013 13:49:46 +0000 (14:49 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge