From: Wilfried Goesgens Date: Thu, 14 Jun 2012 22:06:26 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.12~9 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c1a1720bef64ec79d3b949d9f757b78462071bb5 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c1a1720bef64ec79d3b949d9f757b78462071bb5