Diff

prosodyctl @ 1867:57446ab8806f

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Oct 2009 22:37:44 +0100
parent 1580:5be6dc582df3
child 2020:24f54340a670
line wrap: on
line diff