Mercurial > prosody-hg
diff core/portmanager.lua @ 6826:17a4e89a4780
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | d64c1f3c7e2e |
| children | daaa52b3f45f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | d64c1f3c7e2e |
| children | daaa52b3f45f |