From: Wilfried Goesgens Date: Mon, 11 Jun 2012 20:25:00 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.12~17 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5816b80c48d0b906919377c4f4e477da15f02431 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 5816b80c48d0b906919377c4f4e477da15f02431