Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit3a0fe20e92a616800b0c27cff193468cd3cc9989
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 13 Mar 2008 10:21:51 +0000 (13 11:21 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 13 Mar 2008 10:21:51 +0000 (13 11:21 +0100)
treed010f45dd34f9fd3aa045248ddfd176039d7f0ec
parent189f5a6ded086aafdfa9f837c156dccad0dbaf14
parente14cb99936da00e1b337111c8c751dcf623e3d6d
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

ChangeLog
ChangeLog