Diff

prosodyctl @ 7046:6b4232125f32

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 04 Jan 2016 09:09:15 +0000
parent 6960:50e2277ea05f
child 7065:4fc3c008976f
line wrap: on
line diff