Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 5 Jan 2013 14:29:47 +0000 (15:29 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Sat, 5 Jan 2013 14:29:47 +0000 (15:29 +0100)

Trivial merge