Diff

prosodyctl @ 8133:102e1ec8bee1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 26 Apr 2017 11:55:27 +0200
parent 8128:c14513401d65
child 8146:5c91fb62338e
line wrap: on
line diff