Comparison

man/prosodyctl.man @ 7110:a2d096203b7f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 28 Jan 2016 15:11:33 +0100
parent 7034:27f4d63f136a
child 8005:b472bccf8023
comparison
equal deleted inserted replaced
7107:e7d199c2a22d 7110:a2d096203b7f