e9e91a4 Merge branch 'master' into epel7

Merged and Committed by toshio 10 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -14
file modified
+7 -43
file modified
+1 -1