Xavier Noria 207fa59675 Merge remote branch 'rails/master' ... Conflicts: actionpack/lib/abstract_controller/base.rb		2010-06-20 23:13:19 +02:00
..
layouts.rb	Added title to some other files in actionpack/lib/action_view	2010-06-16 22:57:50 +04:30
partials.rb	Merge remote branch 'rails/master'	2010-06-20 23:13:19 +02:00
rendering.rb	Final touches and fixes.	2010-06-21 00:56:31 +04:30