Diff

util/prosodyctl.lua @ 6729:daa5c83b2879

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 21 May 2015 22:56:39 +0200
parent 6367:769a3577dd85
child 6771:60957dd5b41b
line wrap: on
line diff