From 60ca0d410964567f5aa485f38632f8ae016dff13 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Fri, 8 Apr 2011 15:10:41 -0700
Subject: Version 1.0.12

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e4ef85355..7915b31aff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 1.0.12 (April 8, 2011)
+
+Features:
+
+  - Add --no-deployment option to `install` for disabling it on dev machines
+  - Better error message when git fails and cache is present (@parndt)
+  - Honor :bundle_cmd in cap `rake` command (@voidlock, @cgriego)
+
+Bugfixes:
+
+  - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evan)
+  - Fix changing gem order in lock (@gucki)
+  - Remove color escape sequences when displaying man pages (@bgreenlee)
+  - Fix creating GEM_HOME on both JRuby 1.5 and 1.6 (@nickseiger)
+  - Fix gems without a gemspec and directories in bin/ (@epall)
+  - Fix --no-prune option for `bundle install` (@cmeiklejohn)
+
 ## 1.0.11 (April 1, 2011)
 
 Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 87e5f63b57..acbed5ff76 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,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.0.11" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.12" unless defined?(::Bundler::VERSION)
 end
-- 
cgit v1.2.1