Diff

prosodyctl @ 4078:05a58497a903

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 06 Jan 2011 14:46:59 +0000
parent 3999:58c0de7c6da0
child 4095:6ad7ed619d37
line wrap: on
line diff