Preparing for 3.2.14.rc1 release
Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_association

Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb
Use Ruby 1.8 syntax
Preparing for 3.2.14.rc2 release
Add test to prevent route reloading regression

Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
Update CHANGELOG entry
Preparing for 3.2.14 release
Fix activemodel CHANGELOG
Merge branch '3-2-14' into 3-2-stable
Fix actionpack CHANGELOG entry

It was included by git on the wrong release
Fix merge error when Equality LHS is non-attribute.

This is reworking of rails/rails/pull/7380 made for rails 3.
Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attribute-equalities

Fix merge error when Equality LHS is non-attribute.
Specified column type for quote_value

When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.

I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.

This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.

I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
Tidy up the "Specified column type for quote_value" changes

This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
Fix broken test

quote_value is called on the object not the class
Move changelog entry to the top [ci skip]
Load fixtures from linked folders
Merge pull request #11765 from kassio/load-fixtures-from-linked-folder

Load fixtures from linked folder
Make `rake doc:guides` works again.  Fix #10384.

Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
Fix test incompatible with 1.8.7