aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-27 01:06:23 +0100
committerKim Alvefur <zash@zash.se>2016-11-27 01:06:23 +0100
commitd83f4d63b00b4cf561ad1c81f31f43b560bd7bd1 (patch)
tree5fafe37e76936f880749432bffa3174a7ca120cd /net
parent728d74d8bf721e7f9377bcdeea7e456f15d0e856 (diff)
parentde03c0a6dbfc9cef77bb84609351c0f8f0357f93 (diff)
downloadprosody-d83f4d63b00b4cf561ad1c81f31f43b560bd7bd1.tar.gz
prosody-d83f4d63b00b4cf561ad1c81f31f43b560bd7bd1.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions