diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
commit | 31b47ca492ba0a844e301085dd530d63f43141e6 (patch) | |
tree | f90375b97b687b9dcb19e55c0bf48053c57549e7 /net | |
parent | 7e1a61f76b04981306d02759f4a8c07c8af9ea86 (diff) | |
parent | 8ee33e543a323a86867e28a68be8c2c542f261c3 (diff) | |
download | prosody-31b47ca492ba0a844e301085dd530d63f43141e6.tar.gz prosody-31b47ca492ba0a844e301085dd530d63f43141e6.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions