Merge branch 'master' of orgmode.org:worg
authorBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 21:34:08 +0000 (22:34 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 21:34:08 +0000 (22:34 +0100)

Trivial merge