From: Wilfried Goesgens Date: Wed, 6 Jan 2016 20:01:52 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: Release_902~75 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;ds=sidebyside;h=821bf33f886e4b7126798ab4de68f6049ac06d77;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 821bf33f886e4b7126798ab4de68f6049ac06d77