87acff3 Merge branch 'master' into epel7

Merged and Committed by torsava 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+0 -4
file modified
+2 -1
file modified
+2 -1
file modified
+16 -2