jwiegley/org-mode — pull request #7 by dabrahams (2012-04-23 19:48:52+00:00)
Title: Merges from upstream

You might want to look over the way merge conflicts were resolved