a63ea72 Merge branch 'master' into epel7

Merged and Committed by Raphael Groner 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+3 -0
file removed
-22
file modified
+1 -1
file added
+32
file modified
+60 -50