07d6cfe Merge branch 'epel7' into el6

Merged and Committed by mrunge 9 years ago
    Merge branch 'epel7' into el6
    
    Conflicts:
    	python-tox.spec
    
        
file modified
+11 -4