8aff5b3 Merge branch 'master' into epel7

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