Diff

prosodyctl @ 3184:1b076d237a20

Merge with trunk.
author Waqas Hussain <waqas20@gmail.com>
date Fri, 04 Jun 2010 18:38:35 +0500
parent 3161:73e93a48c0c1
child 3234:2d61773d7ab4
line wrap: on
line diff