Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sat, 15 Mar 2014 04:10:16 +0000 (05:10 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 15 Mar 2014 04:10:16 +0000 (05:10 +0100)

Trivial merge