aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-17 18:04:43 +0100
committerKim Alvefur <zash@zash.se>2016-03-17 18:04:43 +0100
commit1121d5eaced1fe90aafe5ce25fda73bbd4779def (patch)
tree716fb68621be4bcfe9fdb1a11637c9ba21b29f6f /net
parent713017eff1e8314fe4eb81c3d456927c5963dcf0 (diff)
parentfd7f0f219381daca6b4cfb3ed648f81af343370f (diff)
downloadprosody-1121d5eaced1fe90aafe5ce25fda73bbd4779def.tar.gz
prosody-1121d5eaced1fe90aafe5ce25fda73bbd4779def.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions