From cec6bd5a59547dc97fe98975c570fc27a1e970be Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 29 Apr 2012 19:58:00 +0200
Subject: Fixed #18023 -- Removed bundled simplejson.

And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
---
 docs/internals/deprecation.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/internals')

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index e3a5e1a40b..2f594536c5 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -268,6 +268,9 @@ these changes.
 See the :doc:`Django 1.5 release notes</releases/1.5>` for more details on
 these changes.
 
+* The module ``django.utils.simplejson`` will be removed. The standard library
+provides :mod:`json` which should be used instead.
+
 * The function ``django.utils.itercompat.product`` will be removed. The Python
   builtin version should be used instead.
 
-- 
cgit v1.3