From 9c6826394506bf41c94a30e41657a047bb099251 Mon Sep 17 00:00:00 2001
From: James Miller <bensie@gmail.com>
Date: Mon, 2 Apr 2012 17:51:41 -0700
Subject: [PATCH] Update history, bump version to 0.6.1

---
 History.txt                | 4 ++++
 lib/carrierwave/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/History.txt b/History.txt
index e8c810a70..d4e73c0cc 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,7 @@
+=== Version 0.6.1 2012-04-02
+
+* [fixed] Calling #serializable_hash with no options [matthewrudy]
+
 === Version 0.6.0 2012-03-27
 
 * [BREAKING CHANGE] Require Rails 3.2 or Rails master (4.0) - depends on activesupport/activemodel [bensie]
diff --git a/lib/carrierwave/version.rb b/lib/carrierwave/version.rb
index 291f4650c..62a835c36 100644
--- a/lib/carrierwave/version.rb
+++ b/lib/carrierwave/version.rb
@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end