Mercurial > prosody-hg
diff net/server_select.lua @ 3521:896ffec79f57
Merge hoelzro->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | e8c06d20a18b |
| children | 90b21508ac27 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | e8c06d20a18b |
| children | 90b21508ac27 |