Comparison

man/prosodyctl.markdown @ 7220:2156aee1233e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Feb 2016 20:05:56 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7219:c12c9b9c1949 7220:2156aee1233e