From: Wilfried Goesgens Date: Wed, 8 Feb 2012 18:59:00 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~197 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c409452f51adb3b1a6645334d083487012dd5428 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c409452f51adb3b1a6645334d083487012dd5428