Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 09:26:03 +0000 (29 10:26 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Dec 2012 09:26:03 +0000 (29 10:26 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge