From: Wilfried Goesgens Date: Thu, 8 Mar 2012 22:37:00 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~135 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7da250e1c674a7f08080afe2a3b95d2c51617500 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 7da250e1c674a7f08080afe2a3b95d2c51617500