Diff

prosodyctl @ 3214:a69d8021b1db

Merge with Tobias.
author Waqas Hussain <waqas20@gmail.com>
date Wed, 09 Jun 2010 21:34:32 +0500
parent 3161:73e93a48c0c1
child 3234:2d61773d7ab4
line wrap: on
line diff