Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commite8c77968686953ecc11e3399c895adf1f1e388e9
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 25 Jun 2010 18:50:03 +0000 (25 20:50 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 25 Jun 2010 18:50:03 +0000 (25 20:50 +0200)
treecfc7ee68dc7268342d3d6038880deb117e1c5b42
parent41c832ef6ff7436a589195503349737b32dd0a27
parent940b6f90afaeb244bc7e4948c72f69f5ed1d095c
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode