Comparison

prosodyctl @ 7859:9eb13c14eaab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 24 Jan 2017 19:27:17 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7857:db48b1697234 7859:9eb13c14eaab