Comparison

man/prosodyctl.man @ 6418:ae798314347c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Sep 2014 02:22:48 +0200
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
comparison
equal deleted inserted replaced
6410:d782cbb46c2a 6418:ae798314347c