diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-03 16:06:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-03 16:06:16 +0100 |
commit | ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4 (patch) | |
tree | 6ff9f371d84546013bcbbb7ad355b0230c37b46b /net | |
parent | 0b702d28acf78831d94c75d4c239650ee1fe2c53 (diff) | |
parent | 3140ed3d626e976639ef5f38efb9790008834d9c (diff) | |
download | prosody-ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4.tar.gz prosody-ae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions