Merge branch 'master' of orgmode.org:org-mode
commit8b416bf96b5feee64ff78a24395267ee70c9fa5e
authorBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 12:14:03 +0000 (12 14:14 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 12 Sep 2014 12:14:03 +0000 (12 14:14 +0200)
treed20bfa3193154950a941d363ce7d93827e8f3cc0
parenta11e8847238e801b67fe8faa09b612067b518949
parent6eb9827d53fd40927dbca3856dd3d18e051a6b39
Merge branch 'master' of orgmode.org:org-mode