Diff

prosodyctl @ 7805:1cb90024e8db

Merge
author Kim Alvefur <zash@zash.se>
date Sat, 10 Dec 2016 03:00:50 +0100
parent 7676:7311dc843718
child 7679:589e27b47d56
line wrap: on
line diff