Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitb564a944a781c6ca6e551a679fb65f85411be902
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 13 Jul 2010 11:36:37 +0000 (13 13:36 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 13 Jul 2010 11:36:37 +0000 (13 13:36 +0200)
tree56dc63f94864181f4ed0f0635aff455661a18210
parentacf44c879a2748d8c1d211c4af6ed81b92ffab8b
parentc53fc7d246c20d29ef3f0d626a54b9852e14a3fd
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode