Diff

prosodyctl @ 5369:a344c1120e2b

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 22 Mar 2013 15:16:43 +0000
parent 5303:19a4a3462574
child 5394:3d1de30fefec
line wrap: on
line diff