From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 3 Dec 2015 15:43:02 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3c81f27424da7722f5582f73c3cdf4d050c44089;hp=3c81f27424da7722f5582f73c3cdf4d050c44089;p=prosody.git

Merge 0.10->trunk
---