diff options
author | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
commit | 094164e5f0bf835e4fd1dcefa57f3bb4add8325d (patch) | |
tree | 3e6fc617741dec52b661ba121b7949d6b284399d /net | |
parent | 1173ee03d3daede409447b6eb049c1ca06145f50 (diff) | |
parent | 57fe905a8c3eeffb507a0967512a4caccb0e882b (diff) | |
download | prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.tar.gz prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions