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

diff --cc lisp/org.el
Simple merge