fdb8cfe Merge branch 'master' into epel7

Merged and Committed by rmattes 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+2 -0
file modified
+5 -6
file modified
+1 -1