Diff

man/prosodyctl.man @ 6527:074a41ee0409

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 22 Nov 2014 11:53:14 +0100
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
line wrap: on
line diff