Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit2ec171cc779d47361ffbc64a1605511c50d0f534
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 15 Jul 2010 05:20:52 +0000 (15 07:20 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 15 Jul 2010 05:20:52 +0000 (15 07:20 +0200)
tree4308286c1cef1a7b846b6c590a54df689183e285
parentaa163914518d87c71387e31e083747cb4d56a541
parent2f178148f9686687e540786ace56e3562922f6e4
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
lisp/org.el