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.