Diff

prosodyctl @ 4110:8792da53e503

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 11 Jan 2011 04:22:45 +0000
parent 4095:6ad7ed619d37
child 4142:caa78589598f
line wrap: on
line diff