Comparison

man/prosodyctl.markdown @ 7195:39b7ea9141c0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Feb 2016 15:40:35 +0100
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7191:df4f52cabdfe 7195:39b7ea9141c0