aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-02 12:17:41 +0200
committerKim Alvefur <zash@zash.se>2015-10-02 12:17:41 +0200
commit03bee63e1f6cb987d43746970f83a6afb41de24e (patch)
tree9a269b858beb01aa83fc44fbceaf5ac72b7bd6fc /net
parent70775be1a0515ec0c52986541c7f9e0038cc9604 (diff)
parent4408ac9239cd42bcb00d5db9e600910f2aeac891 (diff)
downloadprosody-03bee63e1f6cb987d43746970f83a6afb41de24e.tar.gz
prosody-03bee63e1f6cb987d43746970f83a6afb41de24e.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions