diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-02-26 00:24:23 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-02-26 00:24:23 +0000 |
commit | 05b3139a2ca2d784ac07066d8773ca07b5113159 (patch) | |
tree | aa68c7dba38183a45322f3356d08c73e8c45b599 /net | |
parent | 48f32e711317c95d6d4b32de85ae8b8fe1590533 (diff) | |
parent | 2b4811c8430dcbec09c67b73e8f939b4047f1aec (diff) | |
download | prosody-05b3139a2ca2d784ac07066d8773ca07b5113159.tar.gz prosody-05b3139a2ca2d784ac07066d8773ca07b5113159.zip |
Merge 0.8->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions