From: Jan Schneider <jan@horde.org>
Date: Wed, 7 Jul 2010 14:13:04 +0000 (+0200)
Subject: Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=29625e5a31cd167cfc5f211e1debeeb9d0b65b90;p=horde.git

Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
---

29625e5a31cd167cfc5f211e1debeeb9d0b65b90