From: Wilfried Goesgens Date: Mon, 26 Nov 2012 23:33:51 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~184 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b42480fc7900ffa7af50090b051d9c6359ad54ec Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- b42480fc7900ffa7af50090b051d9c6359ad54ec