Merge branch 'master' of orgmode.org:worg
authorChristian Giménez <cnngimenez@yahoo.com.ar>
Fri, 1 Mar 2013 00:20:14 +0000 (21:20 -0300)
committerChristian Giménez <cnngimenez@yahoo.com.ar>
Fri, 1 Mar 2013 00:20:14 +0000 (21:20 -0300)

Trivial merge