Comparison

prosodyctl @ 6775:22c8deb43daf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 11 Aug 2015 10:29:25 +0200
parent 6751:18f18bceb662
child 6784:4da860edc27c
comparison
equal deleted inserted replaced
6770:cb84731b2dfd 6775:22c8deb43daf