aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-27 20:38:09 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-27 20:38:09 +0000
commit3dd8fb807416165eb0b78a4c9c06e76e1f11c87f (patch)
treeef4b387b06b3d7a01769c3281ec3e928cd7c3385 /net
parent6608113463a183a7cc7b781f402056a7a6f5d367 (diff)
parent04a7cf6290b29c8995d09af0c56e46cf8d2871a2 (diff)
downloadprosody-3dd8fb807416165eb0b78a4c9c06e76e1f11c87f.tar.gz
prosody-3dd8fb807416165eb0b78a4c9c06e76e1f11c87f.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions