Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam@es.gnu.org>
Thu, 27 Dec 2012 06:27:02 +0000 (07:27 +0100)
committerDavid Arroyo Menendez <davidam@es.gnu.org>
Thu, 27 Dec 2012 06:27:02 +0000 (07:27 +0100)

Trivial merge