Diff

prosodyctl @ 7747:0e442402cebc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Nov 2016 01:06:23 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff