Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Mon, 24 Dec 2012 22:17:15 +0000 (23:17 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Mon, 24 Dec 2012 22:17:15 +0000 (23:17 +0100)

Trivial merge