Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit4a38efc7e21eb993e0cd3547bc508b6f350f6455
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 4 Apr 2010 20:09:06 +0000 (4 22:09 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 4 Apr 2010 20:09:06 +0000 (4 22:09 +0200)
tree02e6f79a3a9f678d0b7ca908578c856d535d20aa
parentd1500f3c8a1e1ede2e0a400d1fb36094086ba81e
parent1ad6b5b864c2c73866ec6bebe3273ddfa4862b03
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode