From eb7a329fb65e93dcd6c773c167353af9825d7b6e Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Fri, 20 Nov 2015 14:18:47 -0500
Subject: [1.9.x] Fixed #25685 -- Fixed a duplicate query regression on
 deletion of proxied models.

Thanks to Trac alias ppetrid for the report and Tim for the review.

Conflicts:
	tests/delete/tests.py

Forward port of 7c3ef19978b36b61db88a519f799f1ce8d019679 from stable/1.8.x
---
 docs/releases/1.8.7.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/1.8.7.txt b/docs/releases/1.8.7.txt
index 8ffae59b21..df0ff41159 100644
--- a/docs/releases/1.8.7.txt
+++ b/docs/releases/1.8.7.txt
@@ -39,3 +39,6 @@ Bugfixes
 
 * Fixed ``Model.refresh_from_db()`` updating of ``ForeignKey`` fields with
   ``on_delete=models.SET_NULL`` (:ticket:`25715`).
+
+* Fixed a duplicate query regression in 1.8 on proxied model deletion
+  (:ticket:`25685`).
-- 
cgit v1.3