Comparison

prosodyctl @ 7786:b62353e6a8e5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 14 Dec 2016 01:47:19 +0100
parent 7686:8d6f367bed8c
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7780:dbd202e7c587 7786:b62353e6a8e5