Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit88bd7bbe89bac8a92400ab4749f15004683d82b9
authorCarsten Dominik <carsten.dominik@gmail.com>
Thu, 25 Nov 2010 21:32:16 +0000 (25 22:32 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Thu, 25 Nov 2010 21:32:16 +0000 (25 22:32 +0100)
treea178a5acc79066f0e068b683de8635b995a2264d
parentb2f556a1597d03d0f557920b04ce3b4dbb4d8109
parent30b2d604c55dcb52d86fe80d170597fb22581e05
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode