Diff

prosodyctl @ 7523:3c40b972260e

Merge 0.10 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 27 Jul 2016 14:08:32 +0100
parent 7494:f82356adcd71
child 7530:f14094d10925
line wrap: on
line diff