Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Wed, 27 Mar 2013 19:51:29 +0000 (20:51 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Wed, 27 Mar 2013 19:51:29 +0000 (20:51 +0100)

Trivial merge