Merge branch 'master' of orgmode.org:worg
authorDavid Arroyo Menendez <davidam9@riseup.net>
Tue, 18 Mar 2014 22:22:10 +0000 (23:22 +0100)
committerDavid Arroyo Menendez <davidam9@riseup.net>
Tue, 18 Mar 2014 22:22:10 +0000 (23:22 +0100)

Trivial merge