Diff

prosodyctl @ 4137:7b0f6c94b8df

Merge 0.8->trunk.
author Waqas Hussain <waqas20@gmail.com>
date Thu, 03 Feb 2011 13:18:20 +0500
parent 4095:6ad7ed619d37
child 4142:caa78589598f
line wrap: on
line diff