Jon Leighton 735844db71 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/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb		2011-03-04 09:30:27 +00:00
..
strategy	Merge branch 'master' into nested_has_many_through	2011-03-04 09:30:27 +00:00
compressed_mem_cache_store.rb	ActiveSupport::Cache refactoring	2010-04-27 11:13:37 -07:00
file_store.rb	Fix FileStore cache incorrectly regenerating its key from a pathname when a regexp is used in expire_fragment	2010-11-07 20:01:51 -02:00
mem_cache_store.rb	Fix misleading advice to add 'memcache' to Gemfile	2010-10-10 14:30:22 -02:00
memory_store.rb	making comments meaningful by correcting, adding and pruning	2010-07-26 23:03:46 -04:00
synchronized_memory_store.rb	ActiveSupport::Cache refactoring	2010-04-27 11:13:37 -07:00