Diff

prosodyctl @ 7256:9fbb9fbf7e52

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 09 Mar 2016 13:19:38 +0000
parent 7255:3da7c334f034
parent 7252:fa0169cc8511
child 7269:cde4ef90cf3d
line wrap: on
line diff