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

Merge branch 'horde-upstream'
---

ca0689f007454687573dccc476d6fd14c29167fc