Diff

prosodyctl @ 5108:022123451e52

Merge 0.9->trunk
author Waqas Hussain <waqas20@gmail.com>
date Tue, 28 Aug 2012 05:12:25 +0500
parent 5101:a94c43cad081
child 5134:43c5227fdd3b
line wrap: on
line diff