From: Wilfried Goesgens Date: Fri, 23 Dec 2011 19:04:13 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~283 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=88ce429160c3a4309df55bfa3abdf31154cbe2db Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 88ce429160c3a4309df55bfa3abdf31154cbe2db