Xavier Noria 207fa59675 Merge remote branch 'rails/master' ...

Conflicts:
	actionpack/lib/abstract_controller/base.rb

2010-06-20 23:13:19 +02:00

..

active_record

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

rails/generators

Fix problem with migrations template that can cause bogus code to be created

2010-06-20 12:32:51 +02:00

active_record.rb

eliminate alias_method_chain from ActiveRecord

2010-05-09 02:37:52 +03:00