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 11:02:00 +0000 (13:02 +0200)
committerJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 11:02:00 +0000 (13:02 +0200)
commit47eba91fe13f787a1ff3bbad6a4435d7c3d386bb
treeb2581d6a3f04c29924fb54675337c8ff854c320b
parent6a443c3842a9894488ea534f64c252d26e634502
parent0541c1b25837ad4701a5979e3e9c488d53ef0dbe
Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7