Diff

man/prosodyctl.man @ 6727:eb9c842b80fa

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 19 May 2015 23:23:44 +0200
parent 2699:1ae8a1ac93bd
child 7032:817c7b197ac7
line wrap: on
line diff