Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitf7e520ecc1b70489ddd5d5c4d3f8a025ffa7746b
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 24 Dec 2009 08:30:12 +0000 (24 09:30 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 24 Dec 2009 08:30:12 +0000 (24 09:30 +0100)
treed80daef68a0f2d77d869ee4fc737e192dce24391
parentaadd7399e1fdc21ba8d52dc6f2149e6e7baa9c4a
parent126f7a358209ed2b4e2d601ef38fa50d229fa409
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode