Diff

prosodyctl @ 2937:9380838a19dc

Merge 0.7/waqas->0.7/MattJ
author Matthew Wild <mwild1@gmail.com>
date Wed, 24 Mar 2010 22:40:53 +0000
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff