Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitc76eda31ee861044987d3e35ced42bf2e43613f3
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Jul 2010 18:34:03 +0000 (9 20:34 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 9 Jul 2010 18:34:03 +0000 (9 20:34 +0200)
tree29446ef61329cfe8cf6acbeaac97ff179ad7ce09
parentd4781b9d88a6e85c0792e6e24de49834b19b4e57
parent535ea52fff82892645e56b6a0f9f098411d74b4f
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode