From: Wilfried Goesgens Date: Fri, 22 Apr 2011 22:50:48 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~299 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=5003203a0820be8749dcd9c58bac2998a186a308;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 5003203a0820be8749dcd9c58bac2998a186a308