From: Wilfried Goesgens Date: Tue, 24 Apr 2012 18:27:06 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~67 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=94ef7564c4585129c6025debe797c8dade2e6885 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 94ef7564c4585129c6025debe797c8dade2e6885