diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-10 17:00:10 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-10 17:00:10 +0200 |
commit | 67e89b14aa010121b550aeb657030109da133489 (patch) | |
tree | 52c29734b165fdace6d9af676cc69f55e818831d /net | |
parent | cad53c06529db2134f14b9cff5c48d748a20aa08 (diff) | |
parent | d28e584ecce0dd774e0d5efb36373e66e01f5c26 (diff) | |
download | prosody-67e89b14aa010121b550aeb657030109da133489.tar.gz prosody-67e89b14aa010121b550aeb657030109da133489.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions