aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-08-11 10:29:25 +0200
committerKim Alvefur <zash@zash.se>2015-08-11 10:29:25 +0200
commitaf5dd482f0ece847376d7d4411806b85f48e996d (patch)
tree02d74684d9b149679340af6d76c462c2a1d4a0b3 /net
parent1338b18fb4cd898fadce44250a4cc04b0f27aca4 (diff)
parentb49513cdeb2bb123625fb87f53a04d42b7eb6fb2 (diff)
downloadprosody-af5dd482f0ece847376d7d4411806b85f48e996d.tar.gz
prosody-af5dd482f0ece847376d7d4411806b85f48e996d.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions