Mercurial > prosody-hg
diff net/server.lua @ 551:53dc98ffde16
Automated merge with http://waqas.ath.cx/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 04 Dec 2008 19:21:50 +0000 |
| parents | 5fabb5aeed9d |
| children | e2a88796cdce |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 04 Dec 2008 19:21:50 +0000 |
| parents | 5fabb5aeed9d |
| children | e2a88796cdce |