From: Wilfried Goesgens Date: Sat, 3 Jan 2015 20:34:06 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v9.01~49 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7fe2f3119b5dd533fe65e84a291719cb2992db94 Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel --- 7fe2f3119b5dd533fe65e84a291719cb2992db94