Diff

prosodyctl @ 3209:cbceb398c1e4

Merge with tip.
author Tobias Markmann <tm@ayena.de>
date Tue, 08 Jun 2010 20:39:27 +0200
parent 3161:73e93a48c0c1
child 3234:2d61773d7ab4
line wrap: on
line diff