diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-02-19 12:18:53 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-02-19 12:18:53 +0000 |
commit | 274ad6f3c048dfda6a49683830bdc23a6b8b8353 (patch) | |
tree | 83d4920cd9d60bef48ee9a465978f102927addea /net | |
parent | ba45830f3e579a981ed7b2ebd3c04fddc9bc81b0 (diff) | |
parent | 4c3e8cf880ebcf95e3258b907e49577e64e26e34 (diff) | |
download | prosody-274ad6f3c048dfda6a49683830bdc23a6b8b8353.tar.gz prosody-274ad6f3c048dfda6a49683830bdc23a6b8b8353.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions