68a7e6e Merge branch 'master' into epel7

Merged and Committed by Orion Poplawski 8 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	macros.python
    	macros.python-srpm
    	python-rpm-macros.spec
    
        
file modified
+9 -5
file modified
+2 -1
file modified
+4 -1