From: Wilfried Goesgens Date: Thu, 30 Jun 2011 21:13:10 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~202 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b6292366a603fa89e22afcce4c3d4a7f5bafc268;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- b6292366a603fa89e22afcce4c3d4a7f5bafc268