From: Wilfried Goesgens Date: Wed, 6 Apr 2011 22:47:01 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~252^2~54 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b0f6f109ffc8efc9e11cd594b55e85ead4eb9e40 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- b0f6f109ffc8efc9e11cd594b55e85ead4eb9e40