Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:16:07 +0000 (16:16 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:16:07 +0000 (16:16 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge