From: Wilfried Goesgens Date: Tue, 5 Jun 2012 18:54:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.12~29^2 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=506939fef3f2a43cae13ed7ca5e98b3076534c83 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 506939fef3f2a43cae13ed7ca5e98b3076534c83