Comparison

prosodyctl @ 7686:8d6f367bed8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 07 Oct 2016 16:52:18 +0200
parent 7530:f14094d10925
parent 7679:589e27b47d56
child 7923:81f3068fc30c
comparison
equal deleted inserted replaced
7669:b332db1baf0b 7686:8d6f367bed8c