From b8aa25527e8f57914bc9dffca1d97c3e6562f5e5 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Wed, 9 May 2012 16:57:30 -0400
Subject: [PATCH] updated changelog

---
 CHANGELOG.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b60adeb..2ba0ca9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,8 +2,22 @@
 
 = Master
 
+== 0.12.1
+
 * Added Changelog
 
+* Prevented double decoration, see #173
+
+* ActiveModel::Errors support, 19496f0c
+
+* Fixed autoloading issue, see #188
+
+* Re-did generators, see 9155e58f
+
+* Added capybara integration, see 57c8678e
+
+* Fixed a few bugs with the DecoratedEnumerableProxy
+
 == 0.11.1
 
 * Fixed regression, we don't want to introduce a hard dependency on Rails. #107