comparison util/prosodyctl.lua @ 8121:a33a87f13155

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 24 Apr 2017 14:19:49 +0200
parents 5e18416881bb
children bd591c5fc1bf
comparison
equal deleted inserted replaced
8112:d8ecefcb7c97 8121:a33a87f13155