Pratik Naik 5446d5cb05 Merge remote branch 'mainstream/master' ... Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb		2009-11-17 22:47:23 +00:00
..
active_record	Merge remote branch 'mainstream/master'	2009-11-17 22:47:23 +00:00
active_record.rb	Move validator, human_name and human_attribute_name to ActiveModel, remove deprecated error messages and add i18n_scope and lookup_ancestors.	2009-10-20 17:52:32 -07:00