From 4ea38fc6fc9a3bcf728280c93ec362d1d1df1e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= <boettger@mt7.de>
Date: Tue, 23 Jun 2015 21:43:03 +1200
Subject: [PATCH] version bump to 4.2.0

---
 CHANGELOG.md        | 4 +++-
 lib/aasm/version.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de12229..28ff647 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # CHANGELOG
 
-## 4.2.0 (not yet released)
+## 4.3.0 (not yet released)
+
+## 4.2.0
 
  * support turning off and on the configuration option for `no_direct_assignment` (see [issue #223](https://github.com/aasm/aasm/issues/223) for details)
  * event arguments are now passed to `:after_commit` callbacks as well (see [issue #238](https://github.com/aasm/aasm/pull/238), thanks to [@kuinak](https://github.com/kuinak))
diff --git a/lib/aasm/version.rb b/lib/aasm/version.rb
index 0a2f930..f637511 100644
--- a/lib/aasm/version.rb
+++ b/lib/aasm/version.rb
@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 end