aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:12 +0000
commit0bd91699304e6e338d4bc934f331349d70debaac (patch)
treeec81453553be8ea932864b20a1965d5b58e84ec0 /net
parente031950b06248d986bbad686ea667e5f4a920dad (diff)
downloadprosody-0bd91699304e6e338d4bc934f331349d70debaac.tar.gz
prosody-0bd91699304e6e338d4bc934f331349d70debaac.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions