Mercurial > prosody-hg
diff net/server_select.lua @ 7324:7e6409462f79
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Mar 2016 15:38:14 +0200 |
| parents | 8e64e7b82928 a1570219b865 |
| children | f9e470026042 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Mar 2016 15:38:14 +0200 |
| parents | 8e64e7b82928 a1570219b865 |
| children | f9e470026042 |