diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-21 02:43:38 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-21 02:43:38 +0200 |
commit | 8750213c6c10a57b43d0951bf9fb6d2272d048c1 (patch) | |
tree | b383147eebb56b96cc27488ef4247a6444dd9088 /net | |
parent | 78485768ee3faccea47511db836410f7fa34c03e (diff) | |
parent | 3674d9327763a1c9a69d86d72680de1651fa6511 (diff) | |
download | prosody-8750213c6c10a57b43d0951bf9fb6d2272d048c1.tar.gz prosody-8750213c6c10a57b43d0951bf9fb6d2272d048c1.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions