Comparison

man/prosodyctl.man @ 6690:b2e89583d6e6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 May 2015 22:33:40 +0200
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
comparison
equal deleted inserted replaced
6679:96e034508978 6690:b2e89583d6e6