Diff

prosodyctl @ 7356:f4d51870d212

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 15 Apr 2016 13:39:56 +0200
parent 7313:316ca5c15255
child 7359:a5a080c12c96
line wrap: on
line diff