Diff

prosodyctl @ 7179:bfa3b2ee384c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 22 Feb 2016 15:24:20 +0100
parent 7147:81e54032d14d
child 7191:df4f52cabdfe
line wrap: on
line diff