Merge branch 'master' of orgmode.org:worg
authorNick Dokos <nicholas.dokos@hp.com>
Wed, 3 Jul 2013 20:18:50 +0000 (16:18 -0400)
committerNick Dokos <nicholas.dokos@hp.com>
Wed, 3 Jul 2013 20:18:50 +0000 (16:18 -0400)
I committed a changed version of org-tutorials/index.org which
probably conflicts with upstream. Hope automerge fixes it.

1  2 
org-tutorials/index.org

Simple merge