Jeremy Kemper 7f6779c1d5 Merge branch 'master' into cherry ...

Conflicts:
	activesupport/lib/active_support.rb

2009-04-22 16:53:58 -07:00

..

active_record

Merge branch 'master' into cherry

2009-04-22 16:53:58 -07:00

active_record.rb

No more free lunch

2009-04-22 16:10:49 -07:00

activerecord.rb

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

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