Diff

util/prosodyctl.lua @ 6450:25d86b0f2147

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Sep 2014 03:08:03 +0200
parent 6367:769a3577dd85
child 6771:60957dd5b41b
line wrap: on
line diff