Diff

prosodyctl @ 3318:8d09b21aeaa9

Merge 0.7->trunk
author Waqas Hussain <waqas20@gmail.com>
date Sat, 03 Jul 2010 18:13:54 +0500
parent 3234:2d61773d7ab4
child 3337:4bccec3c24e5
line wrap: on
line diff