rails/rails — pull request #9872 by senny (2013-03-22 14:22:01+00:00)
Title: test-case to prevent resetting associations when preloading twice.

Conflicts:

activerecord/lib/active_record/associations/preloader/through_association.rb
activerecord/test/cases/associations/eager_test.rb