Diff

prosodyctl @ 1843:07d8c9184a5f

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Tue, 29 Sep 2009 14:22:43 +0100
parent 1580:5be6dc582df3
child 2020:24f54340a670
line wrap: on
line diff