Diff

prosodyctl @ 5543:d3f5165c4113

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