From: Jan Schneider <jan@horde.org>
Date: Tue, 9 Nov 2010 17:11:18 +0000 (+0100)
Subject: Merge branch 'horde-upstream'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=075aa65cfb84aba07e9986be3039531067c6ff8a;p=horde.git

Merge branch 'horde-upstream'
---

075aa65cfb84aba07e9986be3039531067c6ff8a