Diff

prosodyctl @ 5651:c968c8e3596d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Jun 2013 13:23:04 +0100
parent 5620:8349ae2a44ce
child 5655:6d7f7548b2c9
line wrap: on
line diff