Mercurial > prosody-hg
diff net/server_select.lua @ 6316:e144a1b67c30
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:47 +0100 |
| parents | ec6e8d5a3fd3 7a3e2f2d43fc |
| children | ec8878113907 |
line wrap: on
line diff
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:47 +0100 |
| parents | ec6e8d5a3fd3 7a3e2f2d43fc |
| children | ec8878113907 |