Diff

prosodyctl @ 5221:115cf8252be8

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