Diff

prosodyctl @ 7654:b40776ee2aef

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Sep 2016 23:00:43 +0100
parent 7530:f14094d10925
child 7686:8d6f367bed8c
line wrap: on
line diff