Diff

prosodyctl @ 4131:81636fa77cab

Merge 0.8->trunk
author Waqas Hussain <waqas20@gmail.com>
date Sat, 29 Jan 2011 04:54:08 +0500
parent 4095:6ad7ed619d37
child 4142:caa78589598f
line wrap: on
line diff