Diff

prosodyctl @ 3115:4c35ef27d868

Merge 0.7/waqas->0.7/MattJ
author Matthew Wild <mwild1@gmail.com>
date Sun, 23 May 2010 23:05:01 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff