From: Wilfried Goesgens Date: Tue, 21 Feb 2012 22:47:25 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~184 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=0c9601dbc42e6eb56a75a0e39bada0199616391a Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 0c9601dbc42e6eb56a75a0e39bada0199616391a