Diff

prosodyctl @ 7788:cf1d7e35a160

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