Diff

prosodyctl @ 7157:0890a428a99b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 10 Feb 2016 07:57:58 +0100
parent 7147:81e54032d14d
child 7191:df4f52cabdfe
line wrap: on
line diff