Diff

prosodyctl @ 6388:264c7c45c381

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Sep 2014 18:51:29 +0100
parent 6367:769a3577dd85
child 6405:61801dacc90b
line wrap: on
line diff