Diff

util/prosodyctl.lua @ 6745:6728ad041761

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parent 6367:769a3577dd85
child 6771:60957dd5b41b
line wrap: on
line diff