Diff

prosodyctl @ 7633:9ddc9401911f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Aug 2016 15:58:16 +0200
parent 7530:f14094d10925
child 7686:8d6f367bed8c
line wrap: on
line diff