shixiong/okd @ f450c935f69366a15e078ec11b82bfa0c7130f6d

Diego Castro f559eb3146 fix merge conflicts		9 лет назад
..
.gitignore	fd7dae3eb7 Make it clear that the byo inventory file is just an example	9 лет назад
hosts.example	f559eb3146 fix merge conflicts	9 лет назад