Merge branch 'master' of orgmode.org:org-mode
commit9bc8ed37318d3ffc8271596d531db4e0bd20b0eb
authorBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 16:38:14 +0000 (4 18:38 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 16:38:14 +0000 (4 18:38 +0200)
tree94a2b9cfe3e0cc138cd35ad83f8f62a96a63d118
parent5aad4a89323c094e7d6dc1457a192c9df646a289
parentd422bfff8d45c31ab532f3b21a42ea6d8028f957
Merge branch 'master' of orgmode.org:org-mode