From: Wilfried Goesgens Date: Wed, 29 Jun 2011 22:48:54 +0000 (+0000) Subject: Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x X-Git-Tag: v7.87~17 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e855e5f1023a379d266be5e7e01d4c12d832c270 Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x --- e855e5f1023a379d266be5e7e01d4c12d832c270