Diff

prosodyctl @ 4144:a1ff207af280

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 13 Feb 2011 22:59:27 +0000
parent 4142:caa78589598f
child 4158:14581c3f33bd
line wrap: on
line diff