aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
committerKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
commitbeb642888ec3e3c27d96f6e4cf969033b8495d8e (patch)
treeead046279a47ea5984c334f0c6500d85f5970dc8 /net
parent02a841a72eb0e02a1f5091d0a23e10bf78ee368c (diff)
parent500d7efbf490f85cb88449f6e28bc8b4162bea14 (diff)
downloadprosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.tar.gz
prosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions