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

Merge branch 'horde-upstream'
---

5810c5d7f580ac0ee1b85064fb2722a722163093