From: Wilfried Goesgens Date: Mon, 2 Jul 2012 23:00:53 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.13~26 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cd367fad021ddbae6f6977a4eb80e426da39248d Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- cd367fad021ddbae6f6977a4eb80e426da39248d