Diff

prosodyctl @ 1610:07be0ac220d8

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Mon, 27 Jul 2009 22:42:36 +0100
parent 1580:5be6dc582df3
child 2020:24f54340a670
line wrap: on
line diff