Diff

prosodyctl @ 7386:5a9af30d5737

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 19 Apr 2016 17:32:22 +0200
parent 7359:a5a080c12c96
child 7447:843fe134453e
line wrap: on
line diff