Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commita082001643ad75600571bdde6c8f3840dfe77658
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 28 May 2010 15:34:12 +0000 (28 17:34 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 28 May 2010 15:34:12 +0000 (28 17:34 +0200)
tree8ed1292c92021a6cdf30679817a153237714480c
parente90fe668acc6063377ea85fefcbcc32355c0fd5e
parent8fac7aa38b9c5741d6cc2a816bb6f556320d18e9
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode