Comparison

prosodyctl @ 4257:8ff9a03e208b

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 18 Apr 2011 20:39:37 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4255:0c525524f2dc 4257:8ff9a03e208b