Diff

prosodyctl @ 3019:6b2e4b581717

Merge 0.6->0.7
author Waqas Hussain <waqas20@gmail.com>
date Thu, 06 May 2010 16:25:40 +0500
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff