Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commite4530f52da3efc40f429189dd33262f6136469d0
authorEric Schulte <schulte.eric@gmail.com>
Wed, 27 Oct 2010 18:04:29 +0000 (27 12:04 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 27 Oct 2010 18:04:29 +0000 (27 12:04 -0600)
treeb3de3a96ae95363e5b112ae9597269a6b14296ae
parent859a1b277e9e111d617c093da2cd0974655de02e
parentc0c2f3896b079b4bfa846f8193f4ef5a2176f0ca
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode