From: badlop <badlop@ono.com>
Date: Thu, 25 Apr 2013 10:25:19 +0000 (-0700)
Subject: Merge pull request #42 from sezuan/2.1.x
X-Git-Tag: v2.1.13~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=371f1f200ed02ba33ba5172be39d537be45950eb;p=ejabberd

Merge pull request #42 from sezuan/2.1.x

2.1.x
---

371f1f200ed02ba33ba5172be39d537be45950eb