From: Jan Schneider <jan@horde.org>
Date: Wed, 7 Jul 2010 10:41:11 +0000 (+0200)
Subject: Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f938bc131c2ea5cfa7f125b096c9016a35b23443;p=horde.git

Merge branch 'prototype-1.7' of dev.horde.org:/horde/git/horde into prototype-1.7
---

f938bc131c2ea5cfa7f125b096c9016a35b23443