Software / code / prosody
Diff
net/server.lua @ 6032:c0ee152400ff
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Mar 2014 23:48:32 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6480:37b12475f648 |
| child | 7098:5286e79c6829 |