Diff

prosodyctl @ 7232:db0dc08929e7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Mar 2016 16:06:16 +0100
parent 7214:a927edfb54ab
child 7251:b74421fe417a
line wrap: on
line diff