Diff

prosodyctl @ 2168:1a99a3bf3ce6 0.6.0

Merge with 0.6 on prosody.im
author Matthew Wild <mwild1@gmail.com>
date Wed, 25 Nov 2009 05:11:10 +0000
parent 2065:c384ae8ee17a
child 2277:c5d3905c98a6
child 2786:534e171036ef
line wrap: on
line diff