Diff

prosodyctl @ 7999:980606856882

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