From: Jan <jan@horde.org>
Date: Thu, 28 Oct 2010 10:08:47 +0000 (+0100)
Subject: Merge branch 'horde-upstream'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=16d6d6336bacbd1d34ab100a6acf38bbac0dcaeb;p=horde.git

Merge branch 'horde-upstream'
---

16d6d6336bacbd1d34ab100a6acf38bbac0dcaeb