From: Wilfried Goesgens Date: Tue, 28 Feb 2012 20:49:14 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~155 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=613695503cbe31ab6f9780b11ba4ea74885f7b15 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 613695503cbe31ab6f9780b11ba4ea74885f7b15