aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-03 02:13:03 +0100
committerKim Alvefur <zash@zash.se>2016-02-03 02:13:03 +0100
commitd9986270925b31fa4ab7cc6813d673233b4ce4f8 (patch)
treeb05cbe5edb0e02f9b3a9a01674912e513c64ac33 /net
parentc2eb4be9a14dec4b4c4fc086f1f6f2bd70991407 (diff)
parent31482d694e1b56f38d2cca26f6eddf468e96e458 (diff)
downloadprosody-d9986270925b31fa4ab7cc6813d673233b4ce4f8.tar.gz
prosody-d9986270925b31fa4ab7cc6813d673233b4ce4f8.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions