Software / code / prosody
Diff
net/server.lua @ 5753:11cb5f64d029
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Jul 2013 23:43:37 +0100 |
| parent | 5531:483f795f6f99 |
| child | 5776:bd0ff8ae98a8 |
| child | 7095:3e1dac35af87 |