Comparison

man/prosodyctl.man @ 6322:c3d750a43d8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Jul 2014 21:16:52 +0200
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
comparison
equal deleted inserted replaced
6318:e5e7a789ef55 6322:c3d750a43d8c