Fix #8832 - Parse '{"person":[]}' JSON/XML as {'person' => []}.
Fixing encoding to UTF-8 for OkJson backend
Merge pull request #9123 from renatosnrg/3-0-stable

Fixing encoding to UTF-8 for OkJson backend. Closes #9122.
Merge pull request #9111 from jsomara/3-0-json-fix

Fix #8832 - Parse '{"person":[]}' JSON/XML as {'person' => []}.
fixed failing JSON decoding in rails 3-0-stable
active_record: Quote numeric values compared to string columns.
mysql2 adapter fixed upstream to delegate quoting of BigDecimal.
Merge pull request #9210 from dylanahsmith/3-0-mysql-quote-numeric

[3.0] active_record: Quote numeric values compared to string columns.
Fix BigDecimal Typecast on 1.8.7
Merge pull request #9223 from robertomiranda/fix-bigdecimal-typecast

Fix BigDecimal Typecast on 1.8.7
Fix issue with attr_protected where malformed input could circumvent
protection

Fixes: CVE-2013-0276

Conflicts:
	activemodel/lib/active_model/attribute_methods.rb
	activerecord/test/cases/mass_assignment_security_test.rb
fix serialization vulnerability
Merge pull request #9126 from mbarb0sa/bugfix/json-decoding-in-rails-3-0-stable

fixed failing JSON decoding in rails 3-0-stable
Merge branch '3-0-sec' into 3-0-stable

* 3-0-sec:
  fix serialization vulnerability
  Fix issue with attr_protected where malformed input could circumvent protection
Merge remote-tracking branch 'upstream/3-0-stable' into 3-0-stable