Merge 0.7 with 0.7
[prosody.git] / man /
drwxr-xr-x   ..
-rw-r--r-- 2819 prosodyctl.man