diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-03-09 18:46:19 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-03-09 18:46:19 +0000 |
commit | 4689bd441e02d84d1b4d7c92c799c506ded4d400 (patch) | |
tree | 7c222d85dc580e33e11963d66a26a2c6bb1c7b1e /net | |
parent | af22709a5ec8dd87242e7f69de6ab33cdf7cc41c (diff) | |
parent | 6d4dea87b271b2b7aafddb96dd42c0dfcbf11b55 (diff) | |
download | prosody-4689bd441e02d84d1b4d7c92c799c506ded4d400.tar.gz prosody-4689bd441e02d84d1b4d7c92c799c506ded4d400.zip |
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions