Diff

prosodyctl @ 4200:fb487ee690ea

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 24 Feb 2011 02:04:56 +0000
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff