aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-20 01:46:54 +0100
committerKim Alvefur <zash@zash.se>2017-02-20 01:46:54 +0100
commitb4b6f7ef293ce05cd9c69d1a2e30e678e8c6d9eb (patch)
treebe7c0181ec8542e0a1056c284cc24ca66e36b9e4 /net
parent20ff11cfc9b824ae15e5315248c6ce368c0d0d3f (diff)
parent2a767fee411984dbf1bbc8d845404d73db0234d7 (diff)
downloadprosody-b4b6f7ef293ce05cd9c69d1a2e30e678e8c6d9eb.tar.gz
prosody-b4b6f7ef293ce05cd9c69d1a2e30e678e8c6d9eb.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions