Diff

prosodyctl @ 6774:3965662ae091

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Mon, 10 Aug 2015 22:16:05 +0200
parent 6751:18f18bceb662
child 6784:4da860edc27c
line wrap: on
line diff