From: Wilfried Goesgens Date: Thu, 18 Oct 2012 18:12:17 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~219 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2f8ba8d58350ea377595b951fb7d20a5618ea0ef Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 2f8ba8d58350ea377595b951fb7d20a5618ea0ef