diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
commit | 9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7 (patch) | |
tree | 87920ea2589baddc568772aeebb1fda17b5c9e0c /net | |
parent | 0c291f3a41eb20f4af48c535eb3b7cfa144b5778 (diff) | |
parent | bd52588649aae5fffa05f1f60d3a9dcd27281271 (diff) | |
download | prosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.tar.gz prosody-9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions