Merge branch 'master' of orgmode.org:org-mode
commit49d59859f04a5c8ba449ada62c3c9808bb6234de
authorBastien Guerry <bzg@altern.org>
Sun, 15 Jun 2014 08:38:18 +0000 (15 10:38 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 15 Jun 2014 08:38:18 +0000 (15 10:38 +0200)
tree28163f1829f5ca91f5b515ef20e97d175579d980
parente9660703965423f0757b3ea7b21a03c096bb81e3
parent7a8de7d1e35a0a3bc05e21d735e2eca69d29640e
Merge branch 'master' of orgmode.org:org-mode