Diff

prosodyctl @ 7758:2b305ec8c146

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 02 Dec 2016 11:13:05 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff