Commit Graph

4 Commits

Author SHA1 Message Date
Orion Poplawski 68a7e6e10b Merge branch 'master' into epel7
Conflicts:
	macros.python
	macros.python-srpm
	python-rpm-macros.spec
2016-01-14 16:22:53 -07:00
Orion Poplawski cbf9c3d9a6 Move py3_other macros to srpm-macros 2016-01-14 15:32:18 -07:00
Orion Poplawski 86a7ec8de5 EPEL version 2016-01-14 14:32:55 -07:00
Orion Poplawski ec28c775cd Initial import 2016-01-12 16:52:28 -07:00