Mercurial > prosody-hg
diff core/hostmanager.lua @ 6605:03a43bf3ecd2
Merge with merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | a10c9d6825a4 |
| children | 8aa967c81cbc 469151b08065 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Mar 2015 00:28:16 +0100 |
| parents | a10c9d6825a4 |
| children | 8aa967c81cbc 469151b08065 |