Diff

prosodyctl @ 5212:c2b431042a54

Merge 0.9->trunk.
author Waqas Hussain <waqas20@gmail.com>
date Sat, 01 Dec 2012 00:31:33 +0500
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff