Comparison

prosodyctl @ 7099:8e64e7b82928

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 22 Jan 2016 15:03:02 +0100
parent 7082:8b590fc77d91
child 7147:81e54032d14d
child 7190:7a14ea196db3
comparison
equal deleted inserted replaced
7091:1c3b38f80571 7099:8e64e7b82928