0a8c79a Merge branch 'master' into epel7

Merged and Committed by Raphael Groner 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+3 -0
file modified
+2 -1
file removed
-32
file modified
+70 -24