Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Fri, 5 Apr 2013 18:05:36 +0000 (20:05 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 5 Apr 2013 18:05:36 +0000 (20:05 +0200)

Trivial merge