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, 1 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index f3e2abfe0d..02c0d7af8d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -144,7 +144,7 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      rg = ENV['RGV'] || 'master'
+      rg = ENV['RGV'] || 'v1.8.24'
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
       specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }