2a46189 Merge branch 'master' into epel7

Merged and Committed by peter 9 years ago
    Merge branch 'master' into epel7
    
        
file added
+25
file modified
+9 -3