Diff

prosodyctl @ 8078:60207251863c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 12 Apr 2017 20:59:18 +0200
parent 8068:5abb6bc45edd
child 8101:3e25d96571d1
line wrap: on
line diff