diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-17 19:16:43 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-17 19:16:43 +0000 |
commit | a8a26e0472703832c51ded651a1860a26b1baff7 (patch) | |
tree | 554b21ae3a5aed22205975f61994d87a561099b3 /net | |
parent | b324d49c610e89fb843cd44c4afd52b500cd65b7 (diff) | |
parent | 24a4b20169a9069e7a6db666696cfcd53b6dfba7 (diff) | |
download | prosody-a8a26e0472703832c51ded651a1860a26b1baff7.tar.gz prosody-a8a26e0472703832c51ded651a1860a26b1baff7.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions