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~307 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=98077cf98a82f673c2bc0486e32187c30c267eb4 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 98077cf98a82f673c2bc0486e32187c30c267eb4