4e6f241 Merge branch 'master' into epel7

Merged and Committed by Orion Poplawski 8 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	scalapack.spec
    
        
file modified
+7 -2