Jeremy Kemper 657898c821 Merge commit 'sven/i18n' ...

Conflicts:
	activesupport/lib/active_support.rb

2008-08-27 12:31:07 -07:00

..

active_record

Fix two has_one :through errors

2008-08-27 11:22:15 +02:00

active_record.rb

I18n: removed call to #populate from main library files

2008-08-27 10:36:00 +02:00

activerecord.rb

Allow frameworks to be required by their gem name (closes #8845) [drnic]

2007-09-22 18:15:05 +00:00