Diff

prosodyctl @ 4255:0c525524f2dc

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 15 Apr 2011 22:46:57 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff