30db322 Merge branch 'master' into f19

Merged and Committed by Deji Akingunola 7 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	mathgl.spec
    
        
file modified
+29 -22