Diff

prosodyctl @ 3202:1a8a5b89a5ad

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 09 Jun 2010 01:11:12 +0100
parent 3161:73e93a48c0c1
child 3234:2d61773d7ab4
line wrap: on
line diff