Mercurial > prosody-hg
diff core/portmanager.lua @ 6081:19ada596aec4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 7a5ddbaf758d |
| children | cb12ff49503d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | 7a5ddbaf758d |
| children | cb12ff49503d |