Comparison

prosodyctl @ 4279:9808e2b32aa5

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 00:05:33 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4274:7cc426988bcc 4279:9808e2b32aa5