dd20ca6 Merge branch 'master' into el6

Merged and Committed by cicku 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	reposurgeon.spec
    
        
file modified
+2 -0
file modified
+28 -5
file modified
+1 -1