From: Ben Homnick Date: Wed, 7 Mar 2012 08:08:48 +0000 (+0800) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1ef38f6272ebb96744d0a8593ab7fa66c31e879;p=ejabberd Merge remote-tracking branch 'upstream/master' --- b1ef38f6272ebb96744d0a8593ab7fa66c31e879