Mercurial > prosody-hg
diff core/hostmanager.lua @ 6557:8aa967c81cbc
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 21 Jan 2015 01:29:00 +0000 |
| parents | ceaf2a0d05eb a10c9d6825a4 |
| children | 352fa2cae1c9 |
line wrap: on
line diff
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 21 Jan 2015 01:29:00 +0000 |
| parents | ceaf2a0d05eb a10c9d6825a4 |
| children | 352fa2cae1c9 |