Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:21:29 +0000 (14:21 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Jul 2013 12:21:29 +0000 (14:21 +0200)

Trivial merge