From: Wilfried Goesgens Date: Sun, 6 Feb 2011 19:24:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~369 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=06dd6b014004b7f12f5cd3c10bfa7711903d3c7a;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 06dd6b014004b7f12f5cd3c10bfa7711903d3c7a