Diff

prosodyctl @ 2262:83823ba8de40

Merge with 0.6.
author Waqas Hussain <waqas20@gmail.com>
date Sun, 29 Nov 2009 18:29:19 +0500
parent 2065:c384ae8ee17a
child 2277:c5d3905c98a6
child 2786:534e171036ef
line wrap: on
line diff