Diff

prosodyctl @ 4245:2494d299d8a2

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 06 Apr 2011 14:48:00 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff