Diff

prosodyctl @ 7878:2fdb7b3648d8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 29 Jan 2017 22:32:03 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff