Diff

prosodyctl @ 3242:43f9478d8119

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 12 Jun 2010 02:47:53 +0100
parent 3234:2d61773d7ab4
child 3337:4bccec3c24e5
line wrap: on
line diff