4856b9 Merge branch 'master' into el5

Merged and Committed by aalvarez 5 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	gfal2-util.spec
    	sources
    
        
file modified
+12 -13
file modified
+1 -1