Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit27ec3527f2cf20679e68371343da2f676e5601c0
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 30 May 2010 20:17:40 +0000 (30 22:17 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 30 May 2010 20:17:40 +0000 (30 22:17 +0200)
treecf6f928cd1b7f93bfee3eb85b886a54b8a94d164
parentb1b066b5f7db6f710c9b40316dd6b4bf63ab151b
parent185625c810111a71f90e2c39a5036e386db60241
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode