aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-01 23:31:13 +0100
committerKim Alvefur <zash@zash.se>2016-01-01 23:31:13 +0100
commitb70c2783801a3fa01d498432f74de66a770636cd (patch)
treea9ef4016bba631979da88bc38fcbe9bd1d1de574 /net
parent0664d7ebf65a3ca356ec80ad4f706919ac745300 (diff)
parent9119466510c4ecdd67a43a74427f24f249436229 (diff)
downloadprosody-b70c2783801a3fa01d498432f74de66a770636cd.tar.gz
prosody-b70c2783801a3fa01d498432f74de66a770636cd.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions