Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit3feebe79d15f26cf334ae7d814e24b5c938108c0
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 5 Mar 2010 12:36:50 +0000 (5 13:36 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 5 Mar 2010 12:36:50 +0000 (5 13:36 +0100)
tree1d968f03db630c587c2d31a4fb39a92525408ff1
parentedffca45e9f4f0f2a86988fb77884fe61885f902
parentba4d698fa1faa569716e7fde8fe9db1b78e19170
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode