Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
authorJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:42:01 +0000 (12:42 +0200)
committerJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 10:42:01 +0000 (12:42 +0200)
commit0541c1b25837ad4701a5979e3e9c488d53ef0dbe
treeb2581d6a3f04c29924fb54675337c8ff854c320b
parentda73e5188abf68eca24baa388d6db352eff600b0
parentf938bc131c2ea5cfa7f125b096c9016a35b23443
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7