comparison util/prosodyctl.lua @ 7639:eab307f7435c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Aug 2016 05:15:13 +0200
parents 5e18416881bb
children bd591c5fc1bf
comparison
equal deleted inserted replaced
7637:cccea9136b2d 7639:eab307f7435c