Diff

prosodyctl @ 4203:e3d937eec3fa

Merge 0.8->trunk.
author Waqas Hussain <waqas20@gmail.com>
date Thu, 24 Feb 2011 19:30:26 +0500
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff