a71ff8a Merge branch 'master' into el6

Merged and Committed by Fabian Affolter 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-anyjson.spec
    	sources
    
        
file modified
+5 -0
file modified
+4 -1
file modified
+2 -1