comparison util/prosodyctl.lua @ 7967:95e16696ef8a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 07 Mar 2017 22:44:12 +0100
parents 5e18416881bb
children bd591c5fc1bf
comparison
equal deleted inserted replaced
7963:4f9535b7fdf7 7967:95e16696ef8a