Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.

Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
switching from UTC-11 to UTC+13. American Samoa did not make the change and
remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
documentation about the dateline change is in austalasia at IANA.

(cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22)
Fix #3993 assets:precompile task does not detect index files
Added test for assets:precompile for index files
Deprecate remove_column with array as an argument
Merge pull request #6095 from route/assets_precompile_task

Fix that asset precompile didn't respect the index.js convention. Fixes #3993.
Fix #4979 against 3-2-stable - delete_all raise an error if a limit is provided
Reset the request parameters after a constraints check

A callable object passed as a constraint for a route may access the request
parameters as part of its check. This causes the combined parameters hash
to be cached in the environment hash. If the constraint fails then any subsequent
access of the request parameters will be against that stale hash.

To fix this we delete the cache after every call to `matches?`. This may have a
negative performance impact if the contraint wraps a large number of routes as the
parameters hash is built by merging GET, POST and path parameters.

Fixes #2510.
(cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)
Make sure that javascript_include_tag/stylesheet_link_tag methods in
sprockets/helpers/rails_helper.rb discard duplicated assets
Add a role option to wrap_parameters.

The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
improvements in "caching_with_rails" guide - backported from docrails

Conflicts:

	railties/guides/source/caching_with_rails.textile
Merge pull request #6158 from Dagnan/3-2-stable

improvements in "caching_with_rails" guide
added beginning_of_hour support to core_ext calculations for Time and DateTime
Merge pull request #4445 from nragaz/role_based_params_wrapping

specify a role for identifying accessible attributes when wrapping params
Merge pull request #6128 from frodsan/delete_all_limit_32

Fix #4979 against 3-2-stable
Give more detailed instructions in script/rails in engine

closes #4894
Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2-stable

Backport beginning and end of hour support for Time and DateTime to 3-2-stable
Add failing test re #3436 which demonstrates content_type is not respected when using the :head method/shortcut
If content_type is explicitly passed to the :head method use the value or fallback
Merge pull request #6198 from whistlerbrk/3-2-stable

Address ActionPack head method not respecting explicitly set content-type #3436
locking ruby-prof until we got a fix