Diff

prosodyctl @ 7201:7a8cffafeff0

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 25 Feb 2016 22:37:41 +0100
parent 7193:1c0104a56321
child 7195:39b7ea9141c0
child 7208:f666d50cc32b
line wrap: on
line diff