Mercurial > prosody-hg
diff core/portmanager.lua @ 6525:7c273da3cff6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | cb12ff49503d |
| children | 46d7ede2e037 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | cb12ff49503d |
| children | 46d7ede2e037 |