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

Merge branch 'horde-upstream'
---

e57a0b54fe26acb1765dbee32736016b0d4ebbcc