d04919f Merge branch 'master' into epel7

Merged and Committed by msuchy 9 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+8 -3
file modified
+1 -1