Diff

prosodyctl @ 6977:450db0b83fe9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 06 Dec 2015 02:43:01 +0100
parent 6960:50e2277ea05f
child 7065:4fc3c008976f
line wrap: on
line diff