From: Wilfried Goesgens Date: Thu, 3 May 2012 20:06:02 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~47 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=00514372bc3bd09268a8f6764fe5d7b50fce0c41 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 00514372bc3bd09268a8f6764fe5d7b50fce0c41