From: Wilfried Goesgens Date: Tue, 3 Jul 2012 20:24:01 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.13~24 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7821b09d65bd6cce17cf2037df4216abd9efcaf9 Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 7821b09d65bd6cce17cf2037df4216abd9efcaf9