Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit87edef3f87758ba4d5b7d8bae0f305c3d2a8f898
authorEric Schulte <schulte.eric@gmail.com>
Wed, 27 Oct 2010 16:43:22 +0000 (27 10:43 -0600)
committerEric Schulte <schulte.eric@gmail.com>
Wed, 27 Oct 2010 16:43:22 +0000 (27 10:43 -0600)
tree082e37d92b737d828a888b943cf897da280f7faf
parentcf6aa4eb4fc9a36506057adc92ca9c707e046831
parent8471886cee907951a1e71d0bca3cd3227c6b67f8
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode