Merge branch 'master' of orgmode.org:org-mode
commit1a910df1c07b00ed7035036a08ce4b2ec7b0d497
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 06:42:49 +0000 (17 08:42 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 06:42:49 +0000 (17 08:42 +0200)
treec49e5801ef03b951a38b878a8342707743e5feeb
parent255dd41afd333fcfc606e5a10087c678b9122c47
parented44c161f0b6010b988d8c46f4cc1d9aecca321f
Merge branch 'master' of orgmode.org:org-mode