Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menéndez <davidam@es.gnu.org>
Wed, 29 May 2013 14:18:46 +0000 (16:18 +0200)
committerDavid Arroyo Menéndez <davidam@es.gnu.org>
Wed, 29 May 2013 14:18:46 +0000 (16:18 +0200)

Trivial merge