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