Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitf0c25d8431323f7ab917e809f5e09374e417dd19
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 11 Jul 2010 16:53:00 +0000 (11 18:53 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 11 Jul 2010 16:53:00 +0000 (11 18:53 +0200)
tree25597ef9745401678b10cf80e9ac97a28c79f750
parent96e5f293f8e2059bac6c8bf5572be5a1c64dd4f7
parentef839e1080ee2302d4d88839f5fb41b8ce7a15a8
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode