aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-27 00:36:34 +0200
committerKim Alvefur <zash@zash.se>2015-09-27 00:36:34 +0200
commit23fa3312e7d966a9205274189eb6b5d0d793c3be (patch)
treea060ff32f39e4a6fbce69a8c25da3d7f1e45900d /net
parent9a4c2f7e52b68d56c4c883234cc704ef1b045b33 (diff)
parent60ca835146d1b3857be9a82579907afe5449556e (diff)
downloadprosody-23fa3312e7d966a9205274189eb6b5d0d793c3be.tar.gz
prosody-23fa3312e7d966a9205274189eb6b5d0d793c3be.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions