From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 31 Aug 2010 18:00:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.01~807
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=84f596cfd831e6f38626c2d23c0cb81bee17e1cb;hp=d91993b02381c683f14bfc6f45476c68ef45662a;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---