From 74f7747b461e30c86883d1c1c84a2c3d61b87cd5 Mon Sep 17 00:00:00 2001
From: Pavel Kunc <pavel.kunc@gmail.com>
Date: Thu, 8 Apr 2010 00:32:32 +0100
Subject: [PATCH] Update changelog.

---
 CHANGELOG | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index ab5d96c..ccb1f2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
-== 1.0.10 "??" ???
+== 1.1.0 2010-04-08
 
+* Added support for Merb 1.2 (set Merb#orm when requirede)
+* Removing Jeweler and switched from generated gemspec to normal one
+* Webrat API fixes in session spec
+* Removing crud from the spechelper such as RubyGems
 * Updating README to match latest state
 
 == 1.0.9 "Get official" 2009-11-10