From: Wilfried Goesgens Date: Thu, 28 Jul 2011 12:15:36 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~98 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=a1ba09ef9d23f1f047cec4b17ae0a3b88c01979d;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- a1ba09ef9d23f1f047cec4b17ae0a3b88c01979d