From: Wilfried Goesgens Date: Thu, 9 Feb 2012 21:51:16 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~195 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=91238fd122152d8127d2b6974ecec24b08fe26c5;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 91238fd122152d8127d2b6974ecec24b08fe26c5