diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-02 02:31:18 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-02 02:31:18 +0100 |
commit | b863e05f3535fdd9b73491412c3fcb50830c46c5 (patch) | |
tree | 5c18192e6e617619650e72e269b8fd1077770a69 /net | |
parent | a4b6de0e0b40d521317119e3d16ff679d5945ea0 (diff) | |
parent | 7037ff8b95c6d1860b1ca9e42a9916ac237419cc (diff) | |
download | prosody-b863e05f3535fdd9b73491412c3fcb50830c46c5.tar.gz prosody-b863e05f3535fdd9b73491412c3fcb50830c46c5.zip |
Merge 0.8->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions