aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-05-09 23:28:09 +0200
committerKim Alvefur <zash@zash.se>2014-05-09 23:28:09 +0200
commitcb8d6cd008a01a8fc7427c9489a2366e17e88a62 (patch)
tree880497293119863efbe9818f2a01b5ccbedc48bb /net
parent36b77bca8b95755721072cdb0e677e30458593e4 (diff)
parenteeacb3cb6ff5510cb5af8ea2c622783562ced91c (diff)
downloadprosody-cb8d6cd008a01a8fc7427c9489a2366e17e88a62.tar.gz
prosody-cb8d6cd008a01a8fc7427c9489a2366e17e88a62.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions