Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Tue, 28 Jan 2014 20:33:36 +0000 (21:33 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 28 Jan 2014 20:33:36 +0000 (21:33 +0100)

Trivial merge