Comparison

prosodyctl @ 4306:a101c59772e7

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 05 Jun 2011 01:54:06 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4302:bbb0bf0a09f5 4306:a101c59772e7