diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-21 15:22:17 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-21 15:22:17 +0200 |
commit | c55c6b322bc1ee0f5d4aa25aba740433ef7f570f (patch) | |
tree | b96edba7a396231bd9a41c1dd9cb9fcf11879642 /net | |
parent | 418962b61c0f94621515125c59185d428bce1327 (diff) | |
parent | db408d9cf0fbec0bc273ceaf23c80e53dddcd95d (diff) | |
download | prosody-c55c6b322bc1ee0f5d4aa25aba740433ef7f570f.tar.gz prosody-c55c6b322bc1ee0f5d4aa25aba740433ef7f570f.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions