aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-10 17:00:10 +0200
committerKim Alvefur <zash@zash.se>2016-08-10 17:00:10 +0200
commite06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d (patch)
tree52c29734b165fdace6d9af676cc69f55e818831d /net
parent73579026ea1c955372484e57006bef2811f792c7 (diff)
parent64e565546890b709a23ce3d3077e69d7822a6703 (diff)
downloadprosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.tar.gz
prosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions