Jon Leighton 9a98c766e0 Merge branch 'master' into nested_has_many_through ... Conflicts: activerecord/CHANGELOG 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_through_association.rb		2010-12-12 09:55:32 +00:00
..
active_record	Merge branch 'master' into nested_has_many_through	2010-12-12 09:55:32 +00:00
rails/generators	updating generators	2010-11-17 14:57:54 -08:00
active_record.rb	Always pull in version for frameworks (standardize autoload / require / none)	2010-10-10 16:12:04 -07:00