comparison util/prosodyctl.lua @ 7619:f5016c8985d7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 19 Aug 2016 22:49:36 +0200
parents 5e18416881bb
children bd591c5fc1bf
comparison
equal deleted inserted replaced
7606:f40f1d9b7872 7619:f5016c8985d7