From: Wilfried Goesgens Date: Sat, 3 Aug 2013 14:20:51 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~5 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c6579e9bf76c520390532dd3866839ca13d61b70 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c6579e9bf76c520390532dd3866839ca13d61b70