Diff

prosodyctl @ 7038:22f36a3d6369

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 01 Jan 2016 23:31:13 +0100
parent 6960:50e2277ea05f
child 7065:4fc3c008976f
line wrap: on
line diff