Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit1217e02e56257fdeffcb04868469b502b1feb07a
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 5 Jul 2010 17:01:13 +0000 (5 19:01 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 5 Jul 2010 17:01:13 +0000 (5 19:01 +0200)
treec952e30959f51aa6f59dea0601281177115c702d
parent040b2aa6b2d8e1d83a9ccd6c399d1a311416aeaa
parent6d4cf4db847d2cc8fc69ac105df938d024446350
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode