From: Wilfried Goesgens Date: Sat, 12 Nov 2011 15:47:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.02~13 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=9e62c72daac38e870bf53c44e16bb8ebba2b5c33;hp=-c;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 9e62c72daac38e870bf53c44e16bb8ebba2b5c33