Diff

prosodyctl @ 7885:236b5a6154b2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 04 Feb 2017 01:08:27 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff