From 691b145645bb4176a54b2f1b33d1789fd793e799 Mon Sep 17 00:00:00 2001
From: Matt Griffin <matt@griffinonline.org>
Date: Mon, 11 Apr 2011 16:03:01 -0400
Subject: [PATCH] Add note to changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 55a4196a7..52232368d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2.1.5 - Unreleased
+* Fix problem deserializing models that use a custom primary key column
+
 2.1.4 - 2011-02-11
 * Working around issues when psych is loaded, fixes issues with bundler 1.0.10 and Rails 3.0.4
 * Added -p/--prefix option to help differentiate multiple delayed job workers on the same host.