Diff

prosodyctl @ 7768:57d0f2d3d5c5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 05 Dec 2016 23:03:09 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
line wrap: on
line diff