Preparing for 3.0.11 release
Bugfix circular reference while saving has_one relationship
Test for circular reference while saving has_one relationship
fix output safety issue with select options
add AS::SafeBuffer#clone_empty
use AS::SafeBuffer#clone_empty for flushing the output_buffer
Merge commit 'v3.0.11' into 3-0-stable
updating RAILS_VERSION
Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount
Ensure [] respects the status of the buffer.
Merge branch '3-0-stable-security' into 3-0-12

* 3-0-stable-security:
  Ensure [] respects the status of the buffer.
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
bumping to 3.0.12
Merge branch '3-0-12' into 3-0-stable

* 3-0-12:
  bumping to 3.0.12
  Ensure [] respects the status of the buffer.
  updating RAILS_VERSION
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
Stop SafeBuffer#clone_empty from issuing warnings

Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1

This was issuing a "not initialized variable" warning - related to:
https://github.com/rails/rails/pull/5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
fixed test when running with latest 1.8.7-p357 and ree
Merge pull request #5319 from arunagw/fix_test_ree

Fix test ree 3-0-stable
Merge pull request #5456 from brianmario/redirect-sanitization

Strip null bytes from Location header
Conflicts:

	actionpack/test/controller/redirect_test.rb
Merge pull request #5457 from brianmario/typo-fix

Fix typo in redirect test
Add order to tests that rely on db ordering, to fix failing tests on pg

Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.

Conflicts:

	activerecord/test/cases/associations/join_model_test.rb
	activerecord/test/cases/associations/nested_through_associations_test.rb
	activerecord/test/cases/clone_test.rb
	activerecord/test/cases/dup_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/cases/yaml_serialization_test.rb
Fix more failing tests related to ruby 1.8.7 p358 version change