Mercurial > prosody-hg
diff net/server_select.lua @ 6791:e813e8cf6046
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Aug 2015 13:05:22 +0200 |
| parents | 01cd51777abb ec172dbe9d14 |
| children | 40d50c239564 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Aug 2015 13:05:22 +0200 |
| parents | 01cd51777abb ec172dbe9d14 |
| children | 40d50c239564 |