Diff

prosodyctl @ 7324:7e6409462f79

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 29 Mar 2016 15:38:14 +0200
parent 7313:316ca5c15255
child 7359:a5a080c12c96
line wrap: on
line diff