85d4299 Merge branch 'master' into el5

Merged and Committed by Alejandro Alvarez Ayllon 9 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	gfal2-python.spec
    	sources
    
        
file modified
+18 -4
file modified
+1 -1