diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-01 21:48:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-01 21:48:54 +0200 |
commit | 2364604bc18ed52d599160a169a465d85a20a0c6 (patch) | |
tree | 214a9406424aedff14725baa7b40b5869ccdf1e6 /net | |
parent | e8b2d9e21f41b2253cbe594bdbc42b2d48ca11cf (diff) | |
parent | 67572368f294b4a1f018ab78d42bdf7cf12e7d8c (diff) | |
download | prosody-2364604bc18ed52d599160a169a465d85a20a0c6.tar.gz prosody-2364604bc18ed52d599160a169a465d85a20a0c6.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions