Diff

prosodyctl @ 7542:0f92dc8e8b88

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