This reverts commit 987eb7d4.

This reverts commit 7c562d5e.

Conflicts:

	actionpack/lib/action_view/helpers/form_helper.rb

Fixed ActionView::FormOptionsHelper#select with :multiple => false

Remove AssociationReflection#create_association and AssociationReflection#create_association! - they are not called from anywhere.

Assign the association attributes to the associated record before the before_initialize callback of the record runs. Fixes #1842.

Document the change to Array.wrap's behaviour that was made in b4d8c7d1

Added instance_accessor: false to Module#mattr_accessor

Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem

CommandRecorder should delegate in method_missing where possible. Fixes some tests in migration_test.rb under mysql. The problem was introduced in c278a2c5.

Array.wrap should follow Kernel#Array semantics when the object's to_ary is nil. In this case, the object should be wrapped.

Define to_ary on ActiveRecord::Base to return nil. Improve performance of Array#flatten under 1.9, see comment for details.

This reverts commit 701e8554.

Use 'delegate' macro instead of writing out methods by hand 

Make "rake test" display not only task name but also exception message.

This makes "sprockets/railtie" explicit. This means that sprockets will
be loaded when you require "rails/all". If you are not using requiring
"rails/all", you need to manually load it with all other framework
railties.

In order to be complete, this commit also adds --skip-sprockets to
the rails generator.

ActiveModel::Dirty patch for multiple assignments to the same attribute