Mercurial > prosody-hg
diff net/server_select.lua @ 5444:30ab4e69a50d
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Apr 2013 15:05:16 +0100 |
| parents | d663483036db |
| children | f2631a14b953 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Apr 2013 15:05:16 +0100 |
| parents | d663483036db |
| children | f2631a14b953 |