aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-22 14:39:14 +0200
committerKim Alvefur <zash@zash.se>2016-05-22 14:39:14 +0200
commitf7c696bc0b7d8878647ba115c36ac2309c3b970b (patch)
treef99ef2519cdcd995afdd7e952580485a6ab6a607 /net
parentfdc25c0acc332d7e1a3c1cc73f8999df830b55c8 (diff)
parent5147175a9740948b44ac3ba6c9a99b1aa345a4a3 (diff)
downloadprosody-f7c696bc0b7d8878647ba115c36ac2309c3b970b.tar.gz
prosody-f7c696bc0b7d8878647ba115c36ac2309c3b970b.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions