Diff

prosodyctl @ 2951:294c359a05f5

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Tue, 30 Mar 2010 19:45:56 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff