Diff

prosodyctl @ 4509:e886bd7c2f6c

Merge with 0.9
author Matthew Wild <mwild1@gmail.com>
date Sun, 12 Feb 2012 17:55:22 +0000
parent 4487:5f466a50e78b
child 4815:04e6115e060b
line wrap: on
line diff