Merge branch 'maint' of orgmode.org:org-mode into maint
commite6918b0bb2c981f9ac71accb0ab4a1f116fa2835
authorBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:08:10 +0000 (29 13:08 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Apr 2014 11:08:10 +0000 (29 13:08 +0200)
tree891f8ff3982708bb711e3a12fa9ac6a51c43823d
parent3104f7de7baaf55175cabe077e6abdad72b2a586
parentea50ad41bee8a813fd7c172574fd3c600c6b34f0
Merge branch 'maint' of orgmode.org:org-mode into maint