Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sun, 27 Jan 2013 08:21:47 +0000 (09:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Jan 2013 08:21:47 +0000 (09:21 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge