Diff

prosodyctl @ 7003:4aa5f6896057

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