aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
committerKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
commita11a584a59cde70ce4f0880049b9e675d8b2e223 (patch)
tree9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /net
parent93f4c5076db39f3cc14bb2ad989ade760da0f107 (diff)
parent4de415d6700cd0f1ab4111cdf4c5f5cb7161c766 (diff)
downloadprosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.tar.gz
prosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions