From: Wilfried Goesgens Date: Mon, 5 Dec 2011 23:19:36 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.03~3 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=35dfcef7abc5e7f6c08a5ca0aab44cbe0031231f Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 35dfcef7abc5e7f6c08a5ca0aab44cbe0031231f