Diff

prosodyctl @ 4257:8ff9a03e208b

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 18 Apr 2011 20:39:37 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff