From: Jan <jan@horde.org>
Date: Fri, 5 Nov 2010 15:12:57 +0000 (+0000)
Subject: Merge branch 'horde-upstream'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=aab4ecb968c38b6d6198546ed20dfe49d67baeea;p=horde.git

Merge branch 'horde-upstream'
---

aab4ecb968c38b6d6198546ed20dfe49d67baeea