Diff

prosodyctl @ 2281:27441b099984

Merge with tip.
author Tobias Markmann <tm@ayena.de>
date Sun, 29 Nov 2009 21:33:37 +0100
parent 2065:c384ae8ee17a
child 2277:c5d3905c98a6
child 2786:534e171036ef
line wrap: on
line diff