Diff

util/prosodyctl.lua @ 2965:0fe9cfaeaed7

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 07 Apr 2010 21:01:06 +0100
parent 2925:692b3c6c5bd2
child 3294:89dd67cc3689
line wrap: on
line diff