Merge v1.1.4 from branch '1-1-stable'

Conflicts:
	CHANGELOG.md
	bin/bundle
	lib/bundler/version.rb
	spec/install/gems/dependency_api_spec.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/bin/bundle b/bin/bundle
index 323fe795..53997cf2 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -8,6 +8,7 @@ $:.each do |path|
     abort(err)
   end
 end
+
 require 'bundler/cli'
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors {Bundler::CLI.start }
+Bundler.with_friendly_errors { Bundler::CLI.start }