This project is archived and is in readonly mode.

Changeset [a08004a9a7d4c93c39f9693f6406ecb70d6a38c0] by Michael Koziarski

Revision a08004a9a7d4c93c39f9693f6406ecb70d6a38c0, committed by Repository · May 6th, 2008 @ 09:53 AM

Merge branch 'master' of git@github.com:rails/rails

A activesupport/lib/active_support/core_ext/process.rb
A activesupport/lib/active_support/core_ext/process/daemon.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/routing/optimisations.rb
M actionpack/lib/action_view/helpers/form_helper.rb
M actionpack/test/controller/base_test.rb
M actionpack/test/template/form_helper_test.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M activesupport/CHANGELOG
M activesupport/lib/active_support/core_ext/kernel/daemonizing.rb
M activesupport/lib/active_support/ordered_options.rb
M activesupport/lib/active_support/values/time_zone.rb
M activesupport/lib/active_support/whiny_nil.rb
M activesupport/test/ordered_options_test.rb
M railties/CHANGELOG
M railties/lib/rails/plugin/locator.rb