Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menéndez <davidam@es.gnu.org>
Sat, 28 Sep 2013 06:38:35 +0000 (08:38 +0200)
committerDavid Arroyo Menéndez <davidam@es.gnu.org>
Sat, 28 Sep 2013 06:38:35 +0000 (08:38 +0200)

Trivial merge