Mercurial > prosody-hg
diff core/hostmanager.lua @ 7085:343be83ddfa6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | e813e8cf6046 |
| children | fa6cd0e9105d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | e813e8cf6046 |
| children | fa6cd0e9105d |