Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/test/schema/schema.rb

1 files changed, 1 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 5e4b2ee1b0..efbcecd75a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.9.0"
     gem "mysql", ">= 2.8.1"
-    # gem "mysql2", ">= 0.2.4"
-    gem "mysql2", :git => "git://github.com/brianmario/mysql2.git"
+    gem "mysql2", ">= 0.2.6"
   end
 end