diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-02 03:06:51 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-02 03:06:51 +0100 |
commit | 5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4 (patch) | |
tree | 86cb32a5b72a214dbd7cf37ee7ae89b5c03de5be /man | |
parent | 31116c6f6ccfa91b67c01b14408e6961cdfb6960 (diff) | |
parent | 0516532553fea667f2f96145ed93eac85ee9135c (diff) | |
download | prosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.tar.gz prosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.zip |
Merge 0.10->trunk
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions