Merge branch '1-2-stable'

Conflicts:
	.rspec
	.travis.yml
	CHANGELOG.md
	Rakefile
	lib/bundler.rb
	lib/bundler/cli.rb
	lib/bundler/source.rb
	lib/bundler/version.rb
	spec/bundler/bundler_spec.rb
	spec/install/gems/dependency_api_spec.rb
	spec/other/newgem_spec.rb
	spec/other/show_spec.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/bundler/ui.rb b/lib/bundler/ui.rb
index 55f5682750..3f5b97383f 100644
--- a/lib/bundler/ui.rb
+++ b/lib/bundler/ui.rb
@@ -25,6 +25,7 @@ module Bundler
     end
 
     class Shell < UI
+      attr_reader :quiet
       attr_writer :shell
 
       def initialize(options = {})
@@ -53,8 +54,8 @@ module Bundler
         tell_me(msg, :red, newline)
       end
 
-      def be_quiet!
-        @quiet = true
+      def quiet=(value)
+        @quiet = value
       end
 
       def quiet?