From: Wilfried Goesgens Date: Thu, 22 Dec 2011 20:17:50 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~285 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7b6191e9787496d0a3157637414210832e68117b Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 7b6191e9787496d0a3157637414210832e68117b