From: the_mgt Date: Wed, 27 Jul 2011 10:17:47 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~98^2~1 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=3c6900e3c0a37be99a317c4f5710510ba270614a;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- 3c6900e3c0a37be99a317c4f5710510ba270614a