Pratik Naik 2ebe8d275e Merge commit 'mainstream/master' ...

Conflicts:

	actionpack/lib/action_controller/request.rb
	actionpack/lib/action_controller/resources.rb

2008-08-14 16:31:14 +01:00

..

active_record

Merge commit 'mainstream/master'

2008-08-14 16:31:14 +01:00

active_record.rb

Fix file permissions

2008-07-31 16:36:23 -05:00

activerecord.rb

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

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