Mercurial > prosody-hg
diff net/server_event.lua @ 6820:40d50c239564
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Sep 2015 16:43:46 +0100 |
| parents | e813e8cf6046 ffb2b5e31456 |
| children | 39789f1669cb |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Sep 2015 16:43:46 +0100 |
| parents | e813e8cf6046 ffb2b5e31456 |
| children | 39789f1669cb |