Comparison

prosodyctl @ 4299:e2674029b8c9

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 03 Jun 2011 05:35:22 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4295:da4844ab289f 4299:e2674029b8c9