Merge branch 'master' of orgmode.org:org-mode
commit77ffc73a4aeb93ddc54c4adbf81971cd055c2759
authorBastien Guerry <bzg@altern.org>
Mon, 26 May 2014 05:26:09 +0000 (26 07:26 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 26 May 2014 05:26:09 +0000 (26 07:26 +0200)
treeec67d92e350eab2cc6ad56741ee69660cf8faca4
parent2affa4d33355313f0a45de80fb4fb10618081529
parentfdb40fbe018cd5b857dd1b22b8f21b1bdf7210df
Merge branch 'master' of orgmode.org:org-mode