Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 08:28:23 +0000 (10:28 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Sep 2012 08:28:23 +0000 (10:28 +0200)

Trivial merge