Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Sat, 13 Apr 2013 12:40:14 +0000 (14:40 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 13 Apr 2013 12:40:14 +0000 (14:40 +0200)

Trivial merge