comparison util/prosodyctl.lua @ 6636:441f8cb0deec

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 27 Apr 2015 00:03:14 +0200
parents 769a3577dd85
children 60957dd5b41b
comparison
equal deleted inserted replaced
6633:832987170da8 6636:441f8cb0deec