Diff

prosodyctl @ 8168:45be94611593

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 13 Jun 2017 20:14:06 +0200
parent 8153:c22d5680ca68
child 8181:79f73af4c410
line wrap: on
line diff