Diff

prosodyctl @ 7982:e30b0cbed472

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