Comparison

prosodyctl @ 7780:dbd202e7c587

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 10 Dec 2016 02:55:38 +0100 (2016-12-10)
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7768:57d0f2d3d5c5 7780:dbd202e7c587