Diff

prosodyctl @ 5536:abb6c6e3d6dc

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 29 Apr 2013 10:44:18 +0100
parent 5534:522e99b898a0
child 5554:e91db0aac408
line wrap: on
line diff