Diff

prosodyctl @ 4278:67ce42aa7419

Merge 0.7->0.8
author Matthew Wild <mwild1@gmail.com>
date Wed, 01 Jun 2011 23:26:39 +0100
parent 4198:3e680514df14
child 4324:5e7cba840409
line wrap: on
line diff