Diff

prosodyctl @ 2166:fb01f0906564

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