From: Wilfried Goesgens Date: Sun, 29 Apr 2012 10:14:09 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~57 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c064b240ff457c4bcdc119aaf7a6a09ff31952e2 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- c064b240ff457c4bcdc119aaf7a6a09ff31952e2