From 91828da238577eb77d9756484d9f6ea09038d1d9 Mon Sep 17 00:00:00 2001
From: Pavel Kunc <pavel.kunc@gmail.com>
Date: Thu, 17 Jun 2010 12:25:26 +0100
Subject: [PATCH] Updating CHANGELOG for the 1.1.2

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

diff --git a/CHANGELOG b/CHANGELOG
index 9790a87d..17f1c4cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+== Merb 1.1.2 "Dependency hell" 2010-06-17
+
+* [merb-core] Gracefully fail when RSpec is not installed but used.
+* [merb-core] Because 1.1.x still use the Bundler we have to depend on it.
+* [merb] Require independent versions of the merb-auth and merb_datamapper.
+
+
 == Merb 1.1.1 "In between the notes" 2010-06-14
 
 * Spec fixes to get more green and 1.8.x compat