Diff

util/prosodyctl.lua @ 7214:a927edfb54ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 18:47:32 +0100
parent 6777:5de6b93d0190
child 7259:d8300985f2bb
line wrap: on
line diff