Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit8b0d3f96bbee761cc683187714c55d3ad5940c42
authorEric Schulte <schulte.eric@gmail.com>
Mon, 7 Jun 2010 16:17:03 +0000 (7 09:17 -0700)
committerEric Schulte <schulte.eric@gmail.com>
Mon, 7 Jun 2010 16:17:03 +0000 (7 09:17 -0700)
treef152411720a933860c24143f170a68dd5cb6d7b0
parent4e43e7fea8441378713374c87b6bc18089491631
parentcab9fefbf97f37bac5f59e9980584b22dd8fb219
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode