From: Wilfried Goesgens Date: Mon, 28 Nov 2011 23:17:05 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.03~16 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=079fa3519c7d719f19dbec9fea6bec1da41ce742 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 079fa3519c7d719f19dbec9fea6bec1da41ce742