Diff

prosodyctl @ 8065:36d9c1226fbc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Apr 2017 00:48:15 +0200
parent 8015:ecb110f45c92
child 8068:5abb6bc45edd
line wrap: on
line diff