Diff

util/prosodyctl.lua @ 2944:855c0eb80600

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Mar 2010 18:53:17 +0000
parent 2925:692b3c6c5bd2
child 3294:89dd67cc3689
line wrap: on
line diff