From: Evgeniy Khramtsov Date: Mon, 1 Nov 2010 13:23:01 +0000 (+0900) Subject: Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into... X-Git-Tag: v2.1.6~88 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=195d22d906c5f2197224556cf45dac0885b5f3c8;p=ejabberd Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x --- 195d22d906c5f2197224556cf45dac0885b5f3c8