2fa856d Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-simplejson

Merged and Committed by toshio 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-simplejson
    
    Conflicts:
    	python-simplejson.spec
    
        
file modified
+9 -3