shixiong/okd @ b8dc610142f88508221d69eeab02ff5f58b5f0c8

Tim Bielawa ba823255fc Fix conflicts in spec file		8 lat temu
..
ansible-quiet.cfg	ba823255fc Fix conflicts in spec file	8 lat temu
ansible.cfg	ba823255fc Fix conflicts in spec file	8 lat temu