From: Jan Schneider <jan@horde.org>
Date: Wed, 30 Jun 2010 21:35:16 +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=3c8646d87999c2b953d452885c5cc99871324652;p=horde.git

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

3c8646d87999c2b953d452885c5cc99871324652