From: Wilfried Goesgens Date: Thu, 19 Jul 2012 10:18:41 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~311 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c7d361a0f38f6b7a8066c1a0b9b677cee7e15ebb Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c7d361a0f38f6b7a8066c1a0b9b677cee7e15ebb