From: Wilfried Goesgens Date: Sun, 22 Apr 2012 08:34:55 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~77 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2108195fbb926251308e8bc0efba6b9bf2cd7a43 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 2108195fbb926251308e8bc0efba6b9bf2cd7a43