From: Wilfried Goesgens Date: Mon, 27 Feb 2012 21:52:09 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~160 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f6e3cd67388eae6f1c6736a56c916f1a22072237 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- f6e3cd67388eae6f1c6736a56c916f1a22072237