Merge branch 'master' of orgmode.org:worg
authorG. Jay Kerns <gkerns@ysu.edu>
Thu, 18 Apr 2013 11:07:28 +0000 (07:07 -0400)
committerG. Jay Kerns <gkerns@ysu.edu>
Thu, 18 Apr 2013 11:07:28 +0000 (07:07 -0400)

Trivial merge