Diff

prosodyctl @ 8074:4b403f881176

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