Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit2c69c8b430d943364d6a01c500bd0866e3e10238
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 12 Nov 2010 13:18:28 +0000 (12 07:18 -0600)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 12 Nov 2010 13:18:28 +0000 (12 07:18 -0600)
tree5daf2f9b80f4b85eec1f35f5360ce94777796db4
parent85e1f9760fd2fa3d50fe34ea18b3b3907926c3b8
parente89e1facc2bb661a83f5f6486a3df21a6b717672
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode