Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Mon, 9 Mar 2009 04:39:30 +0000 (05:39 +0100)
committerGunnar Wrobel <p@rdus.de>
Mon, 9 Mar 2009 04:39:30 +0000 (05:39 +0100)
commitcad00f76e24fbb5e8ccd5c1e7724aaea87430dd6
treeb8664a053d6f96ca1772cd1bb11c649c372b562f
parentc140c5103c1029ce706f1a4c149f3a64513c72f1
parent948535f9f22b40545c337df376edccd319902b58
Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server/HK/GW/InitialImport