Software / code / prosody
Diff
core/hostmanager.lua @ 6692:93eefa92527d
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 May 2015 00:22:56 +0200 |
| parent | 6618:469151b08065 |
| child | 6621:352fa2cae1c9 |
| child | 6706:60c692828cf6 |