Comparison

prosodyctl @ 7791:8efd51667622

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 19 Dec 2016 09:34:40 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7788:cf1d7e35a160 7791:8efd51667622