Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit310210e8549ef4465bdb91c04261711067ef5cd7
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 14 Apr 2010 15:42:23 +0000 (14 17:42 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 14 Apr 2010 15:42:23 +0000 (14 17:42 +0200)
tree7dccd3e952cb1b926a888342137010a07d845cd9
parenta74a748d0f206a82b8f67b3d60d6528d9e876feb
parenta2769bef610bfd02b3acc1f3ad83f018615def0e
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode