From: Wilfried Goesgens Date: Sat, 7 May 2011 13:23:49 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~252^2~37 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6e18c4206732453ee5f076afca4cb0301f8f0e84 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 6e18c4206732453ee5f076afca4cb0301f8f0e84