Software / code / prosody
Diff
net/server.lua @ 6371:624f4689454a
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 12:24:15 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6480:37b12475f648 |
| child | 7098:5286e79c6829 |