aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-22 13:22:50 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-22 13:22:50 +0000
commit7d92cd0c7909499c9e2bf2d179989518fd4133dd (patch)
tree8713f897d9a021ab269f7ceca81a92effec5a967 /net
parent2d5779a6108ae79a32de5cca364fd2dfa427fc2c (diff)
parent19b9ea3838a29c06f1bbb6ddec5645187e675dac (diff)
downloadprosody-7d92cd0c7909499c9e2bf2d179989518fd4133dd.tar.gz
prosody-7d92cd0c7909499c9e2bf2d179989518fd4133dd.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions