diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-03-18 10:33:38 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-03-18 10:33:38 +0000 |
commit | 272ca5fce11d42d9cd3b50c0f3baa03729583443 (patch) | |
tree | a6d0807e4dba931a6e0d15137416c3a532c2161f /net | |
parent | 6d716b8e257b79ae6c89c4b4fe08e0fc4cebd1d7 (diff) | |
parent | ceffa60caf80a654620c0d78d5d9cec76d305a0b (diff) | |
download | prosody-272ca5fce11d42d9cd3b50c0f3baa03729583443.tar.gz prosody-272ca5fce11d42d9cd3b50c0f3baa03729583443.zip |
Merge 0.8->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions