Diff

prosodyctl @ 3028:e095d2a98936

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