From: Wilfried Goesgens Date: Wed, 1 Dec 2010 21:25:57 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~549 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8ec77fe22f3cb317b20fe44b40140c86ad6bd698 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 8ec77fe22f3cb317b20fe44b40140c86ad6bd698