From: Wilfried Goesgens Date: Mon, 28 Nov 2011 21:25:29 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.03~18 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6afa3d124174856ef257e2d666dea8fd9b62dc7c Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 6afa3d124174856ef257e2d666dea8fd9b62dc7c