Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitecc9070fcc7870032cab8f23a612eceb52a1f7fa
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 11 Jan 2010 04:31:54 +0000 (11 05:31 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 11 Jan 2010 04:31:54 +0000 (11 05:31 +0100)
treedbe94dc242ae5fe1e100db3698cd7b047ed59c7f
parent5d48e7fdd638448086bcbaab99e5f5aaa09a4880
parentb3e0d4ea7fd43c6ce0c00ae2c063354882d12c30
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode