From 3ffc23ed7cb1279ed37201ea48086d418666068d Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Wed, 4 May 2016 18:29:22 -0500
Subject: Version 1.12.2 with changelog

---
 CHANGELOG.md           | 6 ++++++
 lib/bundler/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dd1af44c1..0061bc2205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.12.2 (2016-05-04)
+
+Bugfixes:
+  - fix modifying a frozen string when the resolver conflicts on dependencies with requirements (#4520, @grzuy)
+  - fix `bundle exec foo --help` not showing the invoked command's help (#4480, @b-ggs)
+
 ## 1.12.1 (2016-04-30)
 
 Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 181813ae59..2d6ecff5d9 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.12.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.2" unless defined?(::Bundler::VERSION)
 end
-- 
cgit v1.2.1