Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit006ebbcd8094b58da4f01a9531f429e35258086b
authorEric Schulte <schulte.eric@gmail.com>
Fri, 3 Sep 2010 13:43:16 +0000 (3 07:43 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Fri, 3 Sep 2010 13:43:16 +0000 (3 07:43 -0600)
tree55cf55f9052a67c3704343dab6f32df85d510b3a
parentb0dce5a074c13945f4cb747e76986f4df4f9eb1f
parent4f95c5469c214169b0b0f37dceacdf0a1b785add
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode