From: Wilfried Goesgens Date: Fri, 6 Apr 2012 21:20:29 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~105 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5922d6ab5d9d36dafabcf0c5a01499be0f9d2f42 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 5922d6ab5d9d36dafabcf0c5a01499be0f9d2f42