Diff

prosodyctl @ 7986:522099269b49

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 17 Mar 2017 23:14:03 +0100
parent 7923:81f3068fc30c
child 8015:ecb110f45c92
line wrap: on
line diff