From: Wilfried Goesgens Date: Wed, 18 Jul 2012 15:31:52 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~311^2~2 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=de195d66776b36843b2066da98a9f96ee190ccc3 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- de195d66776b36843b2066da98a9f96ee190ccc3