diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
commit | a651d9102302e73f181bc3a81ecdae8f9e21b649 (patch) | |
tree | 780d6035d4a4b758b773a8c2aaea79c554184cf5 /net/server.lua | |
parent | f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b (diff) | |
parent | 1262f0373f70ecdc0f7e39c5ffbe065bc8042ce5 (diff) | |
download | prosody-a651d9102302e73f181bc3a81ecdae8f9e21b649.tar.gz prosody-a651d9102302e73f181bc3a81ecdae8f9e21b649.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions