diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
commit | 1aa0b3a4baeadbf016e8da7c494d2c2233c754f1 (patch) | |
tree | 22c3bd86a1b1249c79c21e3f12989991ef540d33 /net | |
parent | e920776f1d7ab7e0ea1e5d9eadbc7041cac38334 (diff) | |
parent | 8fa3305358309eb79f24c66bb08555ae5e785efa (diff) | |
download | prosody-1aa0b3a4baeadbf016e8da7c494d2c2233c754f1.tar.gz prosody-1aa0b3a4baeadbf016e8da7c494d2c2233c754f1.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions