django/django — pull request #1263 by kidsil (2013-06-12 21:14:46+00:00)
Title: Update json.py

Fixing incompatibility with DjangoFullSerializers + Deprecation of json for simplejson