aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-06-28 14:54:43 +0100
committerMatthew Wild <mwild1@gmail.com>2016-06-28 14:54:43 +0100
commitf4fed64125197c6c6ce830fcd7877c69876bfb50 (patch)
tree73fd2c6aa04110f6c834f99d5de79c9510ccaf26 /net
parentad4206686a546cb2a7423a4ab62c5d3c9a1ea199 (diff)
parent6fc4ad3aefeab816af4b13df7d877386958a510f (diff)
downloadprosody-f4fed64125197c6c6ce830fcd7877c69876bfb50.tar.gz
prosody-f4fed64125197c6c6ce830fcd7877c69876bfb50.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions