fix number_to_human docs [ci skip]
Merge pull request #4528 from j-manu/log-tailer-fix

Fix for log tailer when the log file doesn't exist.
Do not mutate options hash
Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport

Do not mutate options hash
Remove circular require of time/zones
Merge pull request #6038 from arunagw/warning_removed_3-2-stable

Warning removed 3 2 stable
Allow Thor 0.15 and 1.0, to be released shortly
Lazy load `default_form_builder` if it's passed as a string

closes #3341
Don't convert params if the request isn't HTML - fixes #5341
(cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f)

Conflicts:

	actionpack/test/controller/test_test.rb
Fix the build.

* The method for persisted records in 3-2-branch is 'PUT'
* size is generated by default in inputs
Remove warning of unused variable
Merge pull request #6051 from rafaelfranca/fix_build

Fix the build
Escape interpolated params when redirecting - fixes #5688
Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3
Restore interpolation of path option in redirect routes
Add missing require when helpers are used in isolation
Deprecate link_to_function and button_to_function helpers
Add CHANGELOG entry.

Closes #5886
Closes #3093
Add release data to Rails 3.2.3
Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers

Deprecate link_to_function and button_to_function