aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-17 19:31:43 +0200
committerKim Alvefur <zash@zash.se>2015-10-17 19:31:43 +0200
commit111471eea8aeabda5c91b05ac759b57497be2706 (patch)
tree0548f664c5e4ab069b79105c4e0a5cbc8a7b6608 /net
parent539d817c670d5eff6d52778f45200aab62afb84d (diff)
parent4177cd057ec3c4d412b87a8c19e7c32d4c97d31d (diff)
downloadprosody-111471eea8aeabda5c91b05ac759b57497be2706.tar.gz
prosody-111471eea8aeabda5c91b05ac759b57497be2706.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions