From: Wilfried Goesgens Date: Sat, 14 Jan 2012 15:51:47 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~265 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e513f41d4e9fe894313bb9c7f8dc9938fc6db2c9 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- e513f41d4e9fe894313bb9c7f8dc9938fc6db2c9