Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit38f1b209d4163b1cb2041dba132c72e567be71f7
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 3 Mar 2010 11:59:33 +0000 (3 12:59 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 3 Mar 2010 11:59:33 +0000 (3 12:59 +0100)
treec0edceb706e245e500b6a4f9b517edf672bfcb08
parent1c87de51fca7aceadecac6473dc6f4c1d5bde103
parent9c36b20a25ab4613d4ffd0c7216c8fca5002db60
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode