Comparison

prosodyctl @ 6822:621384d89a44

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Sep 2015 23:49:15 +0200
parent 6784:4da860edc27c
child 6837:13b44929ae49
comparison
equal deleted inserted replaced
6820:40d50c239564 6822:621384d89a44