From: Wilfried Goesgens Date: Sun, 26 May 2013 13:47:04 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.20~41 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=65fdf25a39d0ab07270233c1059c53e437c98639;hp=-c;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 65fdf25a39d0ab07270233c1059c53e437c98639