Diff

prosodyctl @ 4518:f2d695d2e31e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 09 Mar 2012 18:46:19 +0000
parent 4487:5f466a50e78b
child 4815:04e6115e060b
line wrap: on
line diff