aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-06-24 15:11:06 +0200
committerKim Alvefur <zash@zash.se>2016-06-24 15:11:06 +0200
commit8d589c476873ff77027c2f64840afaff70422d1c (patch)
treeb8282e1f549aec3a4ab5458ecfd2807c03a0aed8 /net
parent7a878f8b688be25d37ea7040ab2d7f491bd8d25f (diff)
parent7356f170744be074658d2b7dab8b9c2cb470ff9a (diff)
downloadprosody-8d589c476873ff77027c2f64840afaff70422d1c.tar.gz
prosody-8d589c476873ff77027c2f64840afaff70422d1c.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions