Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 14:22:21 +0000 (16:22 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 14:22:21 +0000 (16:22 +0200)
1  2 
lisp/org.el

diff --cc lisp/org.el
Simple merge