Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 09:32:37 +0000 (10:32 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 09:32:37 +0000 (10:32 +0100)

Trivial merge