Mercurial > prosody-hg
diff net/server.lua @ 6516:ecd8d6437053
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 20 Nov 2014 09:02:23 +0000 |
| parents | 4224abbf0fdd |
| children | 8e64e7b82928 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 20 Nov 2014 09:02:23 +0000 |
| parents | 4224abbf0fdd |
| children | 8e64e7b82928 |