Merge branch 'maint' of orgmode.org:org-mode into maint
commitae4950ca98073ffa225907df13bd786786930e76
authorBastien Guerry <bzg@altern.org>
Wed, 12 Sep 2012 13:50:01 +0000 (12 15:50 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 12 Sep 2012 13:50:01 +0000 (12 15:50 +0200)
tree1898944616169c46476d4ee18c5b6fe05480a30f
parent14296c0599d91dc306f7bc589ecc745d9fb936e4
parentf969e24a4317eac2f3a7c14c565ae260f2877e3a
Merge branch 'maint' of orgmode.org:org-mode into maint