Diff

prosodyctl @ 7693:93c041d5bb0b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 13 Oct 2016 16:31:19 +0200
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff