test case to assert that associations do not overwrite after create, fixes #9310
Fix ActiveRecord::Store not tracking changes
destroys association records before saving/inserting new association records

This is a backport of #10417

fixes bug introduced by  #3329
These are the conditions necessary to reproduce the bug:
- For an association, autosave => true.
- An association record is being destroyed
- A new association record is being created.
- There is a unique index one of the association's fields.
- The record being created has the same value as the record being
destroyed on the indexed field.

Before, the deletion of records was postponed until after all
insertions/saves.  Therefore the new record with the identical value in
the indexed field caused a non-unique value error to be thrown at the
database
level.

With this fix, the deletions happen first, before the insertions/saves.
Therefore the record with the duplicate value is gone from the database
before the new record is created, thereby avoiding the non-uniuqe value
error.
Merge pull request #10646 from kennyj/fix_am_20130517

Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
	actionmailer/test/mailers/base_mailer.rb
Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_save

autosave_association issue that occurs when table has unique index (3.2.x backport)
Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many

Fix the `:primary_key` option for `has_many` associations.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/has_many_association.rb
Using 1.8.7 syntax for 3-2-stable
It's scoped in 3-2-stable!

scope => scoped
Merge pull request #10745 from arunagw/build_fix_ruby187

Build fix ruby187
Restore rescue block for when IM is enabled
adding a test for #10830
Override Time.at to work with Time-like values

Time.at allows passing a single Time argument which is then converted
to an integer. The conversion code since 1.9.3r429 explicitly checks
for an instance of Time so we need to override it to allow DateTime
and ActiveSupport::TimeWithZone values.
Merge pull request #10925 from senny/10917_test_to_prevent_regression

regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:

	activerecord/CHANGELOG.md
nokogiri >= 1.6 doesn't work with ruby 1.8
Compare host scheme using case-insensitive regexp

Before:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

After:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

Backport of #10969
indicate the default Rails cache store
memory_store is the default cache store implementation if you call
ActiveSupport::Cache.lookup_store without arguments.
Merge pull request #10883 from ifeelgoods/3-2-stable

The default cache store is :file_store in caching_with_rails.textile
Update the feedback instructions [ci skip]

Since docrails as moved from lifo/docrails to rails/docrails we have
to ask for commit rights or submit patches directly to the rails
repository
Merge pull request #11033 from robin850/patch-1

Update the feedback instructions
Fixes CollectionAssociation#ids_reader returning incorrect ids for new records