Diff

prosodyctl @ 3029:0c7beabfed5b

Merge 0.7->trunk
author Waqas Hussain <waqas20@gmail.com>
date Fri, 07 May 2010 16:21:04 +0500
parent 3015:aad8034ab389
child 3038:6b68355d615a
line wrap: on
line diff