Diff

prosodyctl @ 3044:a6f89c72d305

Merge 0.7/MattJ with 0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 17 May 2010 11:57:01 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff