Diff

prosodyctl @ 6826:17a4e89a4780

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 04 Sep 2015 11:11:40 +0100
parent 6784:4da860edc27c
child 6837:13b44929ae49
line wrap: on
line diff