Diff

prosodyctl @ 7433:7eec6f3c7300

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 22 May 2016 14:39:14 +0200
parent 7311:e9526dd3e8fc
child 7313:316ca5c15255
child 7445:6d2038147d3d
line wrap: on
line diff