Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Wed, 29 Aug 2012 13:58:45 +0000 (15:58 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 29 Aug 2012 13:58:45 +0000 (15:58 +0200)

Trivial merge