diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-17 23:14:03 +0100 |
commit | 3b4130d49016ad983fdcf53931190d0ccdc176c2 (patch) | |
tree | 5b8b1f9e85e04567be99d8697a881b2aa1179bb0 /net | |
parent | 6c23b9334dce0d75e72e5ead56d72b0e6acc9b5a (diff) | |
parent | cf02edf36ed6b8b1234553fc54b8384e9db0be7e (diff) | |
download | prosody-3b4130d49016ad983fdcf53931190d0ccdc176c2.tar.gz prosody-3b4130d49016ad983fdcf53931190d0ccdc176c2.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions