From: Wilfried Goesgens Date: Tue, 29 Jan 2013 23:24:21 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~133 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6f0f2b51a2ccb6873d3b2c8ecb075535d2516729 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 6f0f2b51a2ccb6873d3b2c8ecb075535d2516729