Diff

prosodyctl @ 7236:3304a04281d6

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 04 Mar 2016 22:28:15 +0000
parent 7214:a927edfb54ab
child 7251:b74421fe417a
line wrap: on
line diff