Software / code / prosody
Diff
net/server.lua @ 5945:51ead0aa3a02
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:16 +0000 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6480:37b12475f648 |
| child | 7098:5286e79c6829 |
