From: Wilfried Goesgens Date: Fri, 20 Jan 2012 20:23:40 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~229^2 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=475c21c8532b6ba682535c2b2e19a1427040a669 Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel --- 475c21c8532b6ba682535c2b2e19a1427040a669