68a7e6e
Merge branch 'master' into epel7 Conflicts: macros.python macros.python-srpm python-rpm-macros.spec