Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:51:51 +0000 (23:51 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 29 Sep 2012 21:51:51 +0000 (23:51 +0200)

Trivial merge