diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-02 11:13:05 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-02 11:13:05 +0100 |
commit | 2a9484a488a5878e27b5d749b5bbb0d54f497e86 (patch) | |
tree | b8d5008111c5708e9ee236f6139e5100ccd683d2 /net | |
parent | d83f4d63b00b4cf561ad1c81f31f43b560bd7bd1 (diff) | |
parent | 738528509c19ea443b4066e49b7a93fd2317b0ee (diff) | |
download | prosody-2a9484a488a5878e27b5d749b5bbb0d54f497e86.tar.gz prosody-2a9484a488a5878e27b5d749b5bbb0d54f497e86.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions