Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 11 Jul 2013 12:33:18 +0000 (14:33 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 11 Jul 2013 12:33:18 +0000 (14:33 +0200)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge