Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 29 Dec 2012 15:50:41 +0000 (16:50 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 29 Dec 2012 15:50:41 +0000 (16:50 +0100)

Trivial merge