Diff

prosodyctl @ 4295:da4844ab289f

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 03 Jun 2011 00:58:09 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff