Diff

prosodyctl @ 3227:c80d052569c8

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Jun 2010 16:48:21 +0100
parent 3161:73e93a48c0c1
child 3234:2d61773d7ab4
line wrap: on
line diff