Diff

prosodyctl @ 7820:8a9942086068

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 09 Jan 2017 10:17:39 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff