aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
committerKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
commit3e5d5895f9365fbecf497d9080f8f5705a3266a6 (patch)
tree5d9e9dfec7020f862dc40a4b872556e3661b5327 /net
parent5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688 (diff)
parenta374056fa56185322141484732d963abdee02941 (diff)
downloadprosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.tar.gz
prosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions