diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-05 12:48:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-05 12:48:36 +0200 |
| commit | bac930916798b3c8b3e5e71f11750ec6836b3b41 (patch) | |
| tree | 95b6245c2b66f0d5696ba3cb2d43e61ea3a37357 /net | |
| parent | c1a8a485f70d97442364fa0905a5acefc6be69e0 (diff) | |
| parent | c2f007b32e4da5debcf5a14e0059c5351d1c26ce (diff) | |
| download | prosody-bac930916798b3c8b3e5e71f11750ec6836b3b41.tar.gz prosody-bac930916798b3c8b3e5e71f11750ec6836b3b41.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions