Comparison

man/prosodyctl.markdown @ 7441:df1be36f87b1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 25 May 2016 21:35:09 +0200
parent 7034:27f4d63f136a
child 7741:fd277ee3ac57
comparison
equal deleted inserted replaced
7438:6bf4c227c8f3 7441:df1be36f87b1