Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitc0eb6cfa88f47e7426d4b7649fcd639bd9beae0c
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 14 Jul 2010 20:00:16 +0000 (14 22:00 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 14 Jul 2010 20:00:16 +0000 (14 22:00 +0200)
treebb3daf6df6f3cff412913b23b3a0ad0db0f4c2e4
parent0791edd54ab0ca204ec6720fbe77efb463b9acf6
parent94361a58d66ec24dd01b8bfe5bfb3fcd6d673a4a
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode