From 8bd56f0f7ad2b48a50f12c49d436a469fdbb7135 Mon Sep 17 00:00:00 2001
From: Fred Wu <ifredwu@gmail.com>
Date: Wed, 27 Mar 2013 09:20:04 +1100
Subject: Added changelog for 55e2954

---
 activerecord/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c0e0bb1dbc..9e6d44c8f0 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## unreleased ##
 
+*   Do not reset `inheritance_column` when it's set explicitly.
+    Backport of #5327.
+
+    *kennyj + Fred Wu*
+
 *   Fix a problem wrong exception is occured
     when raising no translatable exception in PostgreSQL.
 
-- 
cgit v1.2.3