Diff

prosodyctl @ 4088:0e5585910583

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Jan 2011 04:42:01 +0000
parent 3999:58c0de7c6da0
child 4095:6ad7ed619d37
line wrap: on
line diff