Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menéndez <davidam@es.gnu.org>
Sat, 8 Jun 2013 21:25:45 +0000 (23:25 +0200)
committerDavid Arroyo Menéndez <davidam@es.gnu.org>
Sat, 8 Jun 2013 21:25:45 +0000 (23:25 +0200)

Trivial merge