Diff

prosodyctl @ 5242:b86172b12912

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