Diff

prosodyctl @ 5346:b8fbb9d07efc

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 12 Mar 2013 12:30:35 +0000
parent 5303:19a4a3462574
child 5394:3d1de30fefec
line wrap: on
line diff