Diff

prosodyctl @ 4248:d79d1255fd40

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