Mercurial > prosody-hg
diff net/server.lua @ 4203:e3d937eec3fa
Merge 0.8->trunk.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 19:30:26 +0500 |
| parents | 447634564356 |
| children | 07d0a3a75c8a |
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 19:30:26 +0500 |
| parents | 447634564356 |
| children | 07d0a3a75c8a |