From e5ab75d2fda8ef2617bc13074206e66c980ca51f Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 27 Oct 2015 14:20:06 -0400
Subject: [PATCH] Refs #25618 -- Forwardported 1.8.6 release note.

Forwardport of 65bff161ffab1310719bdee495d1e9b35f838c31 from stable/1.8.x
---
 docs/releases/1.8.6.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt
index 75bd79542b6..76eb32902d5 100644
--- a/docs/releases/1.8.6.txt
+++ b/docs/releases/1.8.6.txt
@@ -41,3 +41,6 @@ Bugfixes
 
 * Fixed crash with ``contrib.postgres.forms.SplitArrayField`` and
   ``IntegerField`` on invalid value (:ticket:`25597`).
+
+* Added a helpful error message when Django and South migrations exist in the
+  same directory (:ticket:`25618`).