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

Merge branch 'horde-upstream'
---

ac84279dca5d85dd2c4407131fc8565d5b56dc44