From: Wilfried Goesgens Date: Thu, 21 Oct 2010 17:05:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~252^2~403 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=8e096ed7bfde10bc3176933deb7d5c580fbc4a1d;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 8e096ed7bfde10bc3176933deb7d5c580fbc4a1d