Merge branch 'master' of orgmode.org:worg master
authorDavid Arroyo Menendez <davidam9@riseup.net>
Mon, 21 Jul 2014 21:37:13 +0000 (23:37 +0200)
committerDavid Arroyo Menendez <davidam9@riseup.net>
Mon, 21 Jul 2014 21:37:13 +0000 (23:37 +0200)

Trivial merge