2b0a34f Merge branch 'master' into epel7

Merged and Committed by Alejandro Alvarez Ayllon 7 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	gfal2-python.spec
    
        
file modified
+1 -1
file modified
+21 -6
file modified
+1 -1