c3aa0bc Merge branch 'master' into f20

Merged and Committed by Alejandro Alvarez Ayllon 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	gfal2-util.spec
    	sources
    
        
file modified
+11 -8
file modified
+1 -1