Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Tue, 25 Dec 2012 10:33:27 +0000 (11:33 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 25 Dec 2012 10:33:27 +0000 (11:33 +0100)

Trivial merge