aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-14 00:22:56 +0200
committerKim Alvefur <zash@zash.se>2015-05-14 00:22:56 +0200
commit9f6130ddaa3ebb231f617261c0f325a8d4bc29d7 (patch)
tree138caf13843596c4aaf96f61da26a2da69fa8ea2 /net
parentd6a59152ea90202fa09ba8e6ba7386b68978b181 (diff)
parentbaf8af6d14d5f42c13dbe9136dfa606e0dc4acf2 (diff)
downloadprosody-9f6130ddaa3ebb231f617261c0f325a8d4bc29d7.tar.gz
prosody-9f6130ddaa3ebb231f617261c0f325a8d4bc29d7.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions