Diff

prosodyctl @ 3043:1fadbb2e3ca0

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