Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 13:00:49 +0000 (15:00 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 18 Apr 2013 13:00:49 +0000 (15:00 +0200)

Trivial merge