Merge branch 'master' of orgmode.org:org-mode
commit2558de0ab33b7770bce6b9674c5fb4096bb78ea4
authorBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 21:18:49 +0000 (29 23:18 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 21:18:49 +0000 (29 23:18 +0200)
treec762ca67f2e8d26fe52ebe42f17b57c5ed111fbd
parent12d5d5f775cd6d2e3e50fc9230552c8b5a91f83e
parent1358c62ee728021822eadb8c09eeea660b0cabc9
Merge branch 'master' of orgmode.org:org-mode