From: Wilfried Goesgens Date: Sat, 18 Feb 2012 16:25:23 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~190 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=307ff84a60b03889b9cd5ff84c29489177f9a39d Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 307ff84a60b03889b9cd5ff84c29489177f9a39d