diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-01-22 13:22:50 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-01-22 13:22:50 +0000 |
commit | b0864f247d26d45d1a2e6f0dc4958254ca8bcb47 (patch) | |
tree | 8713f897d9a021ab269f7ceca81a92effec5a967 /net | |
parent | 0c0c421a8d90e54e566a2c8ff00544c992336cfc (diff) | |
parent | f9bec76a46fe06d38d82f11489a191574302bc21 (diff) | |
download | prosody-b0864f247d26d45d1a2e6f0dc4958254ca8bcb47.tar.gz prosody-b0864f247d26d45d1a2e6f0dc4958254ca8bcb47.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions