diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
| commit | 67c41ef89e175c064eca7d7518779aefed31c187 (patch) | |
| tree | 9043fbad3e9e1ac74e957347fedc8cca0a635106 /net | |
| parent | 5ebf40bbffcbd1b50d76228307ade67863c3f586 (diff) | |
| parent | 36b9149295afd0c8b48e91c82ef0a1f8ebe7f932 (diff) | |
| download | prosody-67c41ef89e175c064eca7d7518779aefed31c187.tar.gz prosody-67c41ef89e175c064eca7d7518779aefed31c187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions