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

Merge branch 'horde-upstream'
---

b50e1aa744fb642013c8725acf7065bb0e931a8a