comparison util/prosodyctl.lua @ 7179:bfa3b2ee384c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 22 Feb 2016 15:24:20 +0100
parents 5de6b93d0190
children d8300985f2bb
comparison
equal deleted inserted replaced
7171:91d36a37a9ff 7179:bfa3b2ee384c