7e7bd1e Merge branch 'master' of ssh://pkgs.fedoraproject.org/glibc

Merged and Committed by pfrankli 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/glibc
    
    Conflicts:
    	glibc.spec
    
        
file modified
+3 -0
file modified
+9 -5
file modified
+2 -3