Comparison

prosodyctl @ 4286:1bceebe2b117

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 02:31:18 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4283:ffaaa3fd3189 4286:1bceebe2b117