Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 19:45:17 +0000 (20:45 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 23 Dec 2012 19:45:17 +0000 (20:45 +0100)

Trivial merge