Diff

util/prosodyctl.lua @ 7038:22f36a3d6369

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 01 Jan 2016 23:31:13 +0100
parent 6777:5de6b93d0190
child 7259:d8300985f2bb
line wrap: on
line diff