From: Wilfried Goesgens Date: Thu, 24 Nov 2011 21:57:19 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.03~22 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c6ccfb9bc8edb05fdbbccbcc7b0fbc621e287d0b Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c6ccfb9bc8edb05fdbbccbcc7b0fbc621e287d0b