Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit84ac2ccab53f87ab127e24d3ba5a246bc1797cbd
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 3 Mar 2008 10:57:44 +0000 (3 11:57 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 3 Mar 2008 10:57:44 +0000 (3 11:57 +0100)
treeee4419526d2c1bf4ca6eeb223363ba7bcfeda3d9
parentea89f6679624b97c2daaace73951f59cd9a8a109
parent2222e5a2493005ffe4d044500885e95f53b56ff6
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

ChangeLog
ChangeLog
org.el
org.texi