Merge branch 'master' of orgmode.org:org-mode
commita11e8847238e801b67fe8faa09b612067b518949
authorBastien Guerry <bzg@altern.org>
Wed, 10 Sep 2014 09:45:20 +0000 (10 11:45 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Sep 2014 09:45:20 +0000 (10 11:45 +0200)
tree27be69800e520a683d7ad8c85072bd512b4f7aa4
parent7520cf33d9e399019da4546f562b4d677454dadd
parentec8f245d27113d51ed5fda4cd18387acef61286c
Merge branch 'master' of orgmode.org:org-mode