Diff

prosodyctl @ 3150:0005df92d379

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Jun 2010 21:34:16 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
line wrap: on
line diff