Diff

util/prosodyctl.lua @ 4286:1bceebe2b117

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 02:31:18 +0100
parent 4142:caa78589598f
child 4335:3a2a01432b5c
line wrap: on
line diff