From: Wilfried Goesgens Date: Wed, 4 Jan 2012 08:00:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~270 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=de0c66402d252e10fbc3978b843ea1a991a8e92c Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- de0c66402d252e10fbc3978b843ea1a991a8e92c