aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-09-03 16:43:46 +0100
committerMatthew Wild <mwild1@gmail.com>2015-09-03 16:43:46 +0100
commit2c628cc4bac167e28a476931b77ba9185e38e793 (patch)
tree75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /net
parent95e9399b77a5b7e5520cc1187c267171d4c494b7 (diff)
parentd5879e21874bb44b65f58cb21dfd7d5d4dc817b7 (diff)
downloadprosody-2c628cc4bac167e28a476931b77ba9185e38e793.tar.gz
prosody-2c628cc4bac167e28a476931b77ba9185e38e793.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions