Mercurial > prosody-hg
diff core/hostmanager.lua @ 6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | a1da78658a82 |
| children | ceaf2a0d05eb a10c9d6825a4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | a1da78658a82 |
| children | ceaf2a0d05eb a10c9d6825a4 |