From: Wilfried Goesgens Date: Mon, 16 Jul 2012 16:21:37 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.14~18 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=507476eab3402b0b111f58ae52b3826cdff80703 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 507476eab3402b0b111f58ae52b3826cdff80703