Software / code / prosody
Diff
net/server.lua @ 6168:3942630b4e35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:35:54 +0200 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6480:37b12475f648 |
| child | 7098:5286e79c6829 |