Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Fri, 20 Mar 2009 22:51:55 +0000 (23:51 +0100)
committerGunnar Wrobel <p@rdus.de>
Fri, 20 Mar 2009 22:51:55 +0000 (23:51 +0100)
commit028df78faa961c38e7dbef05e812d409befb2e76
tree3b1ea2a600239332c5817196d7a45e56873d0d43
parent63504e418c005a6c4e91b64b224a1458a847cba4
parent9b6b247634324963960af47d0dbb15fbd3fd8f0f
Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server/HK/GW/InitialImport