Merge v1.5.3 from branch '1-5-stable'

Conflicts:
	CHANGELOG.md
	Rakefile
	lib/bundler/cli.rb
	lib/bundler/fetcher.rb
	lib/bundler/installer.rb
	lib/bundler/rubygems_ext.rb
	lib/bundler/source/rubygems.rb
	lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
	lib/bundler/version.rb
	spec/bundler/definition_spec.rb
	spec/bundler/dsl_spec.rb
	spec/bundler/gem_helper_spec.rb
	spec/bundler/safe_catch_spec.rb
	spec/commands/newgem_spec.rb
	spec/install/gems/simple_case_spec.rb
	spec/other/ext_spec.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/spec/other/ext_spec.rb b/spec/other/ext_spec.rb
index 14c432be40..cbee163771 100644
--- a/spec/other/ext_spec.rb
+++ b/spec/other/ext_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Gem::Specification#match_platform" do
   it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
-    expect(darwin.match_platform(pl('java'))).to be false
+    expect(darwin.match_platform(pl('java'))).to eq(false)
   end
 end