Diff

prosodyctl @ 5400:dd91b72a3ba0

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 31 Mar 2013 13:21:19 +0100
parent 5394:3d1de30fefec
child 5442:e66973c81e89
line wrap: on
line diff