Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitd1a5ddbc7e906276d0e036345ac000d4e7d99d57
authorDavid Maus <dmaus@ictsoc.de>
Mon, 20 Sep 2010 08:58:58 +0000 (20 10:58 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Mon, 20 Sep 2010 08:58:58 +0000 (20 10:58 +0200)
tree50c6ff40a231741761de06840b2402d9e58ebc87
parentd6b730ea9713015a5528b8e95c8477110a0de95f
parentbe25b712018d64bb31dd4258dc1be5aff9210b94
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode