Diff

prosodyctl @ 7245:210d8329dc70

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