Diff

prosodyctl @ 3083:cb15fa9242f9

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 21 May 2010 19:45:33 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff