Files
rails/activerecord/lib
John Mileham 043b624390 Don't merge base opts into includes when serializing ARs
Conflicts:

	activerecord/lib/active_record/serialization.rb
2011-05-26 11:40:57 -04:00
..
2011-02-28 22:12:34 +00:00