Diff

prosodyctl @ 7425:0bb98138dacf

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 12 May 2016 18:45:59 +0100
parent 7359:a5a080c12c96
child 7447:843fe134453e
line wrap: on
line diff