60e9f9d Merge remote branch 'origin/master' into f13/master

Merged and Committed by pghmcfc 13 years ago
    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	perl-IO-Socket-SSL.spec
    	sources
    
        
file modified
+1 -1
file modified
+28 -1
file modified
+1 -1