Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit67ef871821e6c343e9a99fccc574fc7126b4c87f
authorEric Schulte <schulte.eric@gmail.com>
Thu, 30 Sep 2010 22:19:27 +0000 (30 16:19 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Thu, 30 Sep 2010 22:19:27 +0000 (30 16:19 -0600)
treef565a7fb87c20a4ddd8f9e6f6919a0243d5020dd
parent2ce87e5e8c5212ace0c126f7a699e11a0db0abd7
parent070bb82709fabda3423476772590fafd9dc3ea1d
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode