From: Jan <jan@horde.org>
Date: Thu, 4 Nov 2010 14:30:48 +0000 (+0000)
Subject: Merge branch 'horde-upstream'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5c8af7494d433ba01b39658da5cf0066c208df32;p=horde.git

Merge branch 'horde-upstream'
---

5c8af7494d433ba01b39658da5cf0066c208df32