From: Wilfried Goesgens Date: Thu, 5 Jan 2012 20:41:37 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~268 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=20f386fa836709f3165102c34e113668ab73094a Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 20f386fa836709f3165102c34e113668ab73094a