4df0bf8 Merge branch 'master' into epel7

Merged and Committed by cicku 9 years ago
    Merge branch 'master' into epel7
    
        
file removed
-25
file modified
+27 -147
file modified
+1 -1