Diff

prosodyctl @ 1771:39e6b986ef01

Merge with 0.5 (no changes!)
author Matthew Wild <mwild1@gmail.com>
date Fri, 11 Sep 2009 03:13:56 +0100
parent 1580:5be6dc582df3
child 2020:24f54340a670
line wrap: on
line diff