Diff

prosodyctl @ 3047:820ae39e06de

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Tue, 18 May 2010 00:47:06 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff