Diff

prosodyctl @ 5437:1994a4483b1c

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 06 Apr 2013 12:21:01 +0100
parent 5394:3d1de30fefec
child 5442:e66973c81e89
line wrap: on
line diff