Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:05 +0000 (14:59 +0100)
committerGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:05 +0000 (14:59 +0100)
commit96605260402a0f7b5c2f23f3642d7068aed20cf6
treec08e6921e047cd2642cc564aafe7908f31e684b6
parentcad00f76e24fbb5e8ccd5c1e7724aaea87430dd6
parentd21691360c555baeecaad4a5d063a198778d3579
Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server/HK/GW/InitialImport