Comparison

man/prosodyctl.markdown @ 7191:df4f52cabdfe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Feb 2016 11:20:00 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7188:e8f20be3e6f8 7191:df4f52cabdfe