Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 10:45:25 +0000 (11:45 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 10:45:25 +0000 (11:45 +0100)

Trivial merge