Diff

prosodyctl @ 2736:27e8452cb426

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Mar 2010 21:03:17 +0000
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff