Diff

prosodyctl @ 7666:03aa330562ed

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 12 Sep 2016 22:31:25 +0100
parent 7530:f14094d10925
child 7686:8d6f367bed8c
line wrap: on
line diff