Diff

prosodyctl @ 1801:71fc110b256d

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Sun, 20 Sep 2009 18:46:35 +0100
parent 1580:5be6dc582df3
child 2020:24f54340a670
line wrap: on
line diff