From: Wilfried Goesgens Date: Mon, 30 Jan 2012 23:53:13 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~205 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d04e4ad0b8ab9e5b71310030704d61b6eceb530b Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- d04e4ad0b8ab9e5b71310030704d61b6eceb530b