Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commitbb30d4f1c973044bd8d78c16618efc280e89a370
authorDavid Maus <dmaus@ictsoc.de>
Sun, 5 Sep 2010 20:45:11 +0000 (5 22:45 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Sun, 5 Sep 2010 20:45:11 +0000 (5 22:45 +0200)
treed4a9c84a5c6c1d3e4f3bf68cf300906ebbab270c
parent108f2f28579f46b1535252f94faac456a4d5b757
parent872d401fb375695ad53c9762a08d3be65df7c616
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode