Diff

util/prosodyctl.lua @ 6623:0da3e10b3333

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 15:22:33 +0200
parent 6367:769a3577dd85
child 6771:60957dd5b41b
line wrap: on
line diff