Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Sun, 31 Mar 2013 01:56:48 +0000 (03:56 +0200)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Sun, 31 Mar 2013 01:56:48 +0000 (03:56 +0200)

Trivial merge