Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit63c49bcaedfcb12d0df60ceb0dbf10a949c7f0fe
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Apr 2010 12:31:02 +0000 (9 14:31 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Apr 2010 12:31:02 +0000 (9 14:31 +0200)
tree06e1996a6f192c8d36468413d0adabecde0ae6ba
parent32db2521bc42811d43f09346fc38816527e8be35
parent0f83b2d203e8da983d23ff84afa2297aa449583a
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode