f0d69a4 Merge branch 'epel7'

Merged and Committed by ralph 9 years ago
    Merge branch 'epel7'
    
    Conflicts:
    	python-alembic.spec
    
        
file modified
+18 -5