Diff

prosodyctl @ 1555:96d620b639d5

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Tue, 14 Jul 2009 22:12:13 +0100
parent 1523:841d61be198f
child 1580:5be6dc582df3
line wrap: on
line diff