From: Jan <jan@horde.org>
Date: Thu, 4 Nov 2010 13:17:25 +0000 (+0000)
Subject: Merge remote branch 'horde/master' into horde-upstream
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=32cdf5fb4161e81c836308394e80ce2c37f0af8e;p=horde.git

Merge remote branch 'horde/master' into horde-upstream
---

32cdf5fb4161e81c836308394e80ce2c37f0af8e