f2ddbe0 Merge branch 'master' into epel7

Merged and Committed by dchen 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+1 -0
file modified
+22 -14