From: Wilfried Goesgens Date: Fri, 6 Apr 2012 15:37:36 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~108 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=959a32be2ef15652d1be4113bb1b72af24ec030c Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 959a32be2ef15652d1be4113bb1b72af24ec030c