Diff

prosodyctl @ 5166:72cdc2d4e15e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Oct 2012 20:15:39 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff