Diff

prosodyctl @ 5119:d868ce990838

Merge 0.9->trunk
author Waqas Hussain <waqas20@gmail.com>
date Wed, 12 Sep 2012 22:03:57 +0500
parent 5101:a94c43cad081
child 5134:43c5227fdd3b
line wrap: on
line diff