8c1917a Merge branch 'master' into epel7

Merged and Committed by cicku 9 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+10 -1
file modified
+1 -1