comparison util/prosodyctl.lua @ 6083:31b2f82e2d3c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 15 Apr 2014 21:54:44 +0200
parents 6cc6b4d407df
children 769a3577dd85
comparison
equal deleted inserted replaced
6081:19ada596aec4 6083:31b2f82e2d3c