Mercurial > prosody-hg
diff net/server_select.lua @ 7042:20ac6972b9aa
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 02 Jan 2016 20:42:53 +0000 |
| parents | 40d50c239564 aff786e7b4ce |
| children | 6b4232125f32 |
line wrap: on
line diff
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 02 Jan 2016 20:42:53 +0000 |
| parents | 40d50c239564 aff786e7b4ce |
| children | 6b4232125f32 |