aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-21 02:40:47 +0100
committerKim Alvefur <zash@zash.se>2016-11-21 02:40:47 +0100
commitfd4206fdb2dc539efb8c2275dbaf3599a72c4933 (patch)
tree62ffc114d6f84139c60043dba1936d9606f9b6ba /net
parent9d8ddba6ca4e2fcdb8939e521fd194fc0d34f680 (diff)
parent58a712e247dbaede24c3297260bae145e0ede16e (diff)
downloadprosody-fd4206fdb2dc539efb8c2275dbaf3599a72c4933.tar.gz
prosody-fd4206fdb2dc539efb8c2275dbaf3599a72c4933.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions