Merge branch 'maint' of orgmode.org:org-mode into maint
commitfa0236ce03d7398654f29f6e64b50606de0d3a5c
authorBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 22:06:39 +0000 (4 00:06 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 22:06:39 +0000 (4 00:06 +0200)
tree7510dc2e2c136ad7587f93b306f064de946f19f7
parent320a1201cde3426433a2b9b92b4036cb9706133b
parent256bb297809409cc721086f1177ed1754d7557ea
Merge branch 'maint' of orgmode.org:org-mode into maint