Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
authorJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:41:11 +0000 (12:41 +0200)
committerJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:41:11 +0000 (12:41 +0200)
commitf938bc131c2ea5cfa7f125b096c9016a35b23443
tree25fe0378e30956f7a02ddce96986f7b65a3ca30e
parentd17f3356a4b7f006226afb853526bb6f120c7d4a
parentee6139d3d2cec11152d3eac4422ce59b2c3f0034
Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7