Merge branch 'maint' of orgmode.org:org-mode into maint
commitd2b807b1a675a386a4b128fb96f421dce0311514
authorBastien Guerry <bzg@altern.org>
Tue, 28 Aug 2012 11:39:09 +0000 (28 13:39 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 28 Aug 2012 11:39:09 +0000 (28 13:39 +0200)
treecddf3836a80f04d61c07c9d4191e2abffd94167d
parente9fee9cd63813bedd8728d8e2fce1ead9a545e7e
parentd58d40f0c864ae3a6d7c66df34769619ad2486c1
Merge branch 'maint' of orgmode.org:org-mode into maint
lisp/org.el