Comparison

prosodyctl @ 7622:96e6df712359

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 20 Aug 2016 19:12:19 +0200
parent 7530:f14094d10925
child 7686:8d6f367bed8c
comparison
equal deleted inserted replaced
7619:f5016c8985d7 7622:96e6df712359