From: Wilfried Goesgens Date: Sun, 4 Nov 2012 13:24:30 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~192 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;ds=sidebyside;h=5578df35fc68eaf4ffde10c3848b72f4aab3899b;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 5578df35fc68eaf4ffde10c3848b72f4aab3899b