From: Wilfried Goesgens Date: Fri, 22 Feb 2013 11:41:15 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~92 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ff7f36e7a7ad88d75d1201a78cb60dc6b2cce299 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- ff7f36e7a7ad88d75d1201a78cb60dc6b2cce299