466207b
Merge commit 'd0fdb0d759b960b41b57bf7c9539901f16062e0a' into f25 Conflicts: python-rpm-macros.spec