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 | b4d3ccdb3c7e3d01db5c5b58f1c2fe7d444ea548 (patch) | |
tree | 86cb32a5b72a214dbd7cf37ee7ae89b5c03de5be /net | |
parent | cf321839ed4c3b7e10969081d3a749a5e04e509b (diff) | |
parent | 68b56946d1ae6acb23cb935fe1071f2d98f04875 (diff) | |
download | prosody-b4d3ccdb3c7e3d01db5c5b58f1c2fe7d444ea548.tar.gz prosody-b4d3ccdb3c7e3d01db5c5b58f1c2fe7d444ea548.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions