Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menéndez <davidam@es.gnu.org>
Thu, 26 Sep 2013 20:04:44 +0000 (22:04 +0200)
committerDavid Arroyo Menéndez <davidam@es.gnu.org>
Thu, 26 Sep 2013 20:04:44 +0000 (22:04 +0200)

Trivial merge