Diff

util/prosodyctl.lua @ 6625:bae327ea487a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 16:24:10 +0200 (2015-04-05)
parent 6367:769a3577dd85
child 6771:60957dd5b41b
line wrap: on
line diff