aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-01 21:28:07 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-01 21:28:07 +0000
commit11dcbc505b599add9294e27addaa697aa97e1e0c (patch)
treeb1ba3e9f2c4c1b332f4b0264453b7b9c01952163 /net
parentbebb4e7b675a3db13263c1946c16b090bcf8f4f5 (diff)
parenta1e077c5e7d4f6d2768c47a6847fbe8eea0f28d8 (diff)
downloadprosody-11dcbc505b599add9294e27addaa697aa97e1e0c.tar.gz
prosody-11dcbc505b599add9294e27addaa697aa97e1e0c.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions