7f626d6 Merge branch 'master' into epel7

Merged and Committed by jussilehtola 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+13 -10