Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 11:25:20 +0000 (13:25 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 3 Sep 2012 11:25:20 +0000 (13:25 +0200)

Trivial merge