Diff

prosodyctl @ 7242:d0296db76ccd

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 05 Mar 2016 23:44:21 +0000
parent 7214:a927edfb54ab
child 7251:b74421fe417a
line wrap: on
line diff