Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam9@riseup.net>
Mon, 17 Mar 2014 18:20:14 +0000 (19:20 +0100)
committerDavid Arroyo Menendez <davidam9@riseup.net>
Mon, 17 Mar 2014 18:20:14 +0000 (19:20 +0100)

Trivial merge