Diff

prosodyctl @ 2058:77244fd4ca99

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 26 Oct 2009 23:30:15 +0000
parent 2020:24f54340a670
child 2065:c384ae8ee17a
line wrap: on
line diff