0d791f9 Merge branch 'master' into el6

Merged and Committed by Fabian Affolter 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Net-Whois-IP.spec
    	sources
    
        
file modified
+1 -2
file modified
+30 -1
file modified
+4 -0