From: Wilfried Goesgens Date: Thu, 29 Dec 2011 12:02:48 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~277 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=87adb75f05be524428f1563ab28a60b1795f4612 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 87adb75f05be524428f1563ab28a60b1795f4612