aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-04 10:53:16 +0100
committerKim Alvefur <zash@zash.se>2017-01-04 10:53:16 +0100
commit0afcc05e469704c12ecc4badcdd8e0c6fbbd5b63 (patch)
tree5e8aa2941ebd2ba5d215cfc9b992b910b394ac5a /net
parentb4d3ccdb3c7e3d01db5c5b58f1c2fe7d444ea548 (diff)
parentd589e26bca988e4345e54bd7ef5a2375be741ad4 (diff)
downloadprosody-0afcc05e469704c12ecc4badcdd8e0c6fbbd5b63.tar.gz
prosody-0afcc05e469704c12ecc4badcdd8e0c6fbbd5b63.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions