Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Tue, 16 Apr 2013 16:11:41 +0000 (18:11 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 16 Apr 2013 16:11:41 +0000 (18:11 +0200)

Trivial merge