Diff

prosodyctl @ 7738:0647b821e00a

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 24 Nov 2016 14:18:25 +0100
parent 7679:589e27b47d56
child 7686:8d6f367bed8c
child 7920:1db51061342b
line wrap: on
line diff