Comparison

man/prosodyctl.markdown @ 7120:a6afe52159f1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Feb 2016 02:13:03 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7119:50b9a7e86de9 7120:a6afe52159f1