From: Wilfried Goesgens Date: Sat, 21 Jan 2012 22:14:43 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~229 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1965fe005619a4a759f23253408cfc3ec9a3ebd2 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 1965fe005619a4a759f23253408cfc3ec9a3ebd2