Software / code / prosody
Diff
net/server.lua @ 5756:61521ce49aae
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Jul 2013 20:29:41 +0200 |
| parent | 5531:483f795f6f99 |
| child | 5776:bd0ff8ae98a8 |
| child | 7095:3e1dac35af87 |