Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitbe56892beb2623317be433472095d0878d12b360
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 9 Dec 2010 21:11:46 +0000 (9 22:11 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 9 Dec 2010 21:11:46 +0000 (9 22:11 +0100)
tree4fd49803711edb32fa8b00c53a313537ba4edfdb
parentd9db1c114d88d7ba4c0cccfdeb2eb06bd0a5cd25
parent52a09a15ad541c9309d3b647d5044d8607c1f0b6
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode