diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:12:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-11-17 17:12:45 +0000 |
| commit | dc786b603f38d2ed33ec00133689fdd27aae3db5 (patch) | |
| tree | 2dbe4eb578cb9b2bdffa5f395573b3f6d3a6ea39 /net | |
| parent | dd417c0f4a850be9280c2589f0a582aa0d7d566d (diff) | |
| parent | a799177379bbe294f1bb5fe1b8b800e2cee72738 (diff) | |
| download | prosody-dc786b603f38d2ed33ec00133689fdd27aae3db5.tar.gz prosody-dc786b603f38d2ed33ec00133689fdd27aae3db5.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions