Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 8 Dec 2012 04:05:53 +0000 (05:05 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 8 Dec 2012 04:05:53 +0000 (05:05 +0100)

Trivial merge