15f4d88 Merge branch 'master' into epel7

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