Diff

prosodyctl @ 5431:19d537b5aacc

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Apr 2013 10:05:18 +0100
parent 5394:3d1de30fefec
child 5442:e66973c81e89
line wrap: on
line diff