Diff

prosodyctl @ 3304:fec74b84df61

Merge backout
author Matthew Wild <mwild1@gmail.com>
date Tue, 29 Jun 2010 20:23:11 +0100
parent 3233:8f78e8164032
child 3234:2d61773d7ab4
line wrap: on
line diff