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
commitb9c17069eac26443575ceee3674a12cb41df4f52 (patch)
treea060ff32f39e4a6fbce69a8c25da3d7f1e45900d /net
parent01328b14950ee60ea8a3b77f4e7899824da0fbe4 (diff)
parentb7b28af321e349cac16f2a9709fe9d618d5d8bf0 (diff)
downloadprosody-b9c17069eac26443575ceee3674a12cb41df4f52.tar.gz
prosody-b9c17069eac26443575ceee3674a12cb41df4f52.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions