Diff

prosodyctl @ 8085:7a13fa890472

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 13 Apr 2017 22:38:31 +0200
parent 8068:5abb6bc45edd
child 8101:3e25d96571d1
line wrap: on
line diff