Comparison

prosodyctl @ 4316:2478698bdc52

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 07 Jun 2011 01:29:34 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4307:332fc256c76e 4316:2478698bdc52