Diff

prosodyctl @ 7207:14ea924a036d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 15:06:56 +0100
parent 7195:39b7ea9141c0
child 7211:117f4a627813
line wrap: on
line diff