From: Wilfried Goesgens Date: Tue, 20 Mar 2012 07:42:21 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~127 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e75e8817291f1504a58c70d721075d82293c9e72 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- e75e8817291f1504a58c70d721075d82293c9e72