Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit3818659c9bd5bcfcd12fd2c7968199e9915dd95f
authorEric Schulte <schulte.eric@gmail.com>
Thu, 4 Nov 2010 13:25:17 +0000 (4 07:25 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Thu, 4 Nov 2010 13:25:17 +0000 (4 07:25 -0600)
treec416216b96f0f1a01af1ed32608ec7a8f6eb64d1
parent3a62685df943051fb8e387d69eb5c6d641238b28
parent73fc8241da7b00758d4e75b22c1d9afd7d86af96
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode