Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:59 +0000 (8 23:44 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:59 +0000 (8 23:44 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge