Diff

prosodyctl @ 3390:a88576f675cb

Merge with trunk.
author Waqas Hussain <waqas20@gmail.com>
date Sat, 17 Jul 2010 19:36:14 +0500
parent 3339:7893055e54d1
child 3471:482275e38224
line wrap: on
line diff