Merge tag 'v1.9.6'

Version 1.9.6

Conflicts:
	CHANGELOG.md
	lib/bundler/installer.rb
	lib/bundler/resolver.rb
	lib/bundler/rubygems_integration.rb
	lib/bundler/source/rubygems.rb
	lib/bundler/version.rb
	man/bundle-config.ronn
	spec/install/post_bundle_message_spec.rb

1 files changed, 6 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index ec21f6a2..462c3be1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -291,12 +291,15 @@ begin
     task :clean do
       rm_rf "lib/bundler/man"
     end
+
+    task(:require) { }
   end
 
 rescue LoadError
   namespace :man do
-    task(:build) { warn "Install the ronn gem to be able to release!" }
-    task(:clean) { warn "Install the ronn gem to be able to release!" }
+    task(:require) { abort "Install the ronn gem to be able to release!" }
+    task(:build) { warn "Install the ronn gem to build the help pages" }
+    task(:clean) { }
   end
 end
 
@@ -308,6 +311,6 @@ end
 
 require 'bundler/gem_tasks'
 task :build => ["man:clean", "man:build"]
-task :release => ["man:clean", "man:build"]
+task :release => ["man:require", "man:clean", "man:build"]
 
 task :default => :spec