Diff

prosodyctl @ 7330:89dd1f86a48a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 03 Apr 2016 15:53:00 +0200
parent 7313:316ca5c15255
child 7359:a5a080c12c96
line wrap: on
line diff