Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Tue, 18 Mar 2014 18:31:31 +0000 (19:31 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 18 Mar 2014 18:31:31 +0000 (19:31 +0100)

Trivial merge