From: Jan Schneider <jan@horde.org>
Date: Wed, 7 Jul 2010 11:02:00 +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=47eba91fe13f787a1ff3bbad6a4435d7c3d386bb;p=horde.git

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

47eba91fe13f787a1ff3bbad6a4435d7c3d386bb