1670fcd Merge branch 'epel7'

Merged and Committed by ralph 9 years ago
    Merge branch 'epel7'
    
    Conflicts:
    	python-datanommer-models.spec