Diff

prosodyctl @ 6399:e26176bf1334

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Sep 2014 19:09:13 +0100
parent 6367:769a3577dd85
child 6405:61801dacc90b
line wrap: on
line diff