Mercurial > prosody-hg
diff net/server_event.lua @ 4110:8792da53e503
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 04:22:45 +0000 |
| parents | 36bee5ca8b95 |
| children | 4716c7645ad2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 04:22:45 +0000 |
| parents | 36bee5ca8b95 |
| children | 4716c7645ad2 |