Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sun, 30 Dec 2012 00:21:32 +0000 (30 01:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 30 Dec 2012 00:21:32 +0000 (30 01:21 +0100)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge