Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Sat, 6 Jul 2013 05:12:57 +0000 (07:12 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 6 Jul 2013 05:12:57 +0000 (07:12 +0200)

Trivial merge