Diff

prosodyctl @ 7292:ec1748626924

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 17 Mar 2016 19:16:43 +0000
parent 7269:cde4ef90cf3d
child 7302:92d86016e1e3
line wrap: on
line diff