Comparison

prosodyctl @ 7745:6d6a04628954

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 26 Nov 2016 20:11:03 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7737:f93b3083b46b 7745:6d6a04628954