adding test for CVE
Update CHANGELOGs for 3.2.13 release.
Preparing for 3.2.13.rc1 release
Freeze columns only once per Result

Conflicts:
	activerecord/lib/active_record/result.rb
Revert "Merge pull request #8209 from senny/backport_8176"

This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing
changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
bumping to rc2
Using latest AR-JDBC for JRuby

1.2.5 and 1.2.6 are bad ones
Merge pull request #9609 from arunagw/using-latest-arjdbc

Using latest AR-JDBC for JRuby
Removing FIXME

As we did in master.
Merge pull request #9613 from arunagw/remove_fixme

Removing FIXME
Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets

Fix incorrectly appended square brackets to a multiple select box

Before:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][]" ...>

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/helpers/tags/base.rb
	actionpack/test/template/form_options_helper_test.rb
Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets

Fix incorrectly appended square brackets to a multiple select box

Before:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][]" ...>

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_view/helpers/tags/base.rb
	actionpack/test/template/form_options_helper_test.rb
Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump

The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse`
which applies the system time DST rules to the parsed time. Instead we now
use `Time.utc` and manually apply the offset.

Backport tests from:
005d910624bbfa724b638426a000c8074d4201a2
c89b6c4cdce7ee55ed3665c099d914222fe0344a
03becb13099c439f6aea5058546bc8b0b19b8db8

Fixes #9678.
Fix ar:mysql2 build on Ruby 1.8.7

The `skip` method is a no-op on Ruby 1.8.7 so we still need to
force skip by returning early from each test.
Extract hardcoded lists to Redo::RestaurantsList
Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks

i18n locale fallback for localized views
Typo fix [ci ski]

Closes #9730.
stop calling to_sym when building arel nodes [CVE-2013-1854]
fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
JDOM XXE Protection [CVE-2013-1856]

Conflicts:
	activesupport/test/xml_mini/jdom_engine_test.rb