Yehuda Katz + Carl Lerche b6bac73b28 Merge commit 'origin/master' ...

Conflicts:
	actionpack/lib/action_controller/abstract/base.rb
	actionpack/lib/action_controller/routing.rb

2009-05-14 17:38:30 -07:00

..

active_record

Merge commit 'origin/master'

2009-05-14 17:38:30 -07:00

active_record.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

activerecord.rb

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

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