0dba1e9
Merge branch 'epel7-2.0.0' into epel7 Conflicts: qemu.spec Rebase our changes on top of master with 2.0.0. Overwriting any our possible changes.