Diff

prosodyctl @ 3312:12fc7e005e8b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Jul 2010 17:44:14 +0100
parent 3234:2d61773d7ab4
child 3337:4bccec3c24e5
line wrap: on
line diff