Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit7100bbea6132ef94203815935322d67a4208f469
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 25 Jun 2010 07:03:16 +0000 (25 09:03 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 25 Jun 2010 07:03:16 +0000 (25 09:03 +0200)
tree55d305c2a8ef20c3b9b079f7ae3bd4dc9a2335c2
parenta547c1048b6a195fb4d3ae79697753b3e69e3398
parenta969714755e9831f2762068bd48c18e2d9087946
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode