Diff

prosodyctl @ 5342:4c8c8285bf88

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 10 Mar 2013 11:29:47 +0000
parent 5303:19a4a3462574
child 5394:3d1de30fefec
line wrap: on
line diff