Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit798ebf518baefa538e0a645cb12c9f994e6beb88
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 30 Jun 2010 13:30:03 +0000 (30 15:30 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 30 Jun 2010 13:30:03 +0000 (30 15:30 +0200)
treef8abfecf79de1aac0f5640483740c773c2b64af6
parenta0962e02fdc8e345961a946801f7370bf546e09c
parent706129c0c4c3f96fabd5e0bd00bca39b1e9a7347
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode