diff options
| author | Kim Alvefur <zash@zash.se> | 2016-08-20 19:12:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-08-20 19:12:19 +0200 |
| commit | b64910fc5d530f585e294c22eb9f6bb16130c990 (patch) | |
| tree | e2df670ebfac5cde1c4306595b171dcb8e90d37e /net | |
| parent | b2bedf9f16dba9bf7496b4e50997e380b28c5b1e (diff) | |
| parent | a73876f45b6503d8304d3a667c4508fcc4fb1f1c (diff) | |
| download | prosody-b64910fc5d530f585e294c22eb9f6bb16130c990.tar.gz prosody-b64910fc5d530f585e294c22eb9f6bb16130c990.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions