From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 5 May 2015 21:20:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: Release_902~168
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1d738ab06a5394f604de22f816b87efaa6f2563a

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

1d738ab06a5394f604de22f816b87efaa6f2563a