add the class name to the assertion message
bigdecimal can be duped on Ruby 2.0

Conflicts:

	activesupport/test/core_ext/duplicable_test.rb
probably should require the objects we monkey patch.
Merge pull request #5800 from arunagw/bigdecimal_dup

Backport BigDecimal#duplicable? feature check from master
test against ruby features in order to fix tests on Ruby 2.0
Merge pull request #5820 from arunagw/more_ruby-2-0-fixes

Update test for Ruby 2 compatibility
Fix code example in generator test case
fix typo in readme [ci skip]
"rails new -h" shows message in rails directory
Add missing require in Active Support time zones (fixes #5854)

I also removed the other require as it's already present in
`activesupport/core_ext/time/calculations`
multi_json is restricted to < 1.3 

Some API changes are there above 1.3. 
3-2-stable
Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable

Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
converting some tests to assert_raises, and DRY'ing retrieve_variable changes

Conflicts:

	actionpack/test/template/render_test.rb
Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more maintained debugger gem
Merge pull request #5874 from asanghi/3-2-stable

replace ruby-debug19 with debugger on Rails 3-2 stable
Check for nil logger
Merge pull request #5894 from norman/3-2-fix-nil-logger

Fix nil logger on 3.2
Add hook for add_resource_route
Revert "Fix #5667. Preloading should ignore scoping."

Causes a subtle regression where record.reload includes the default
scope. Hard to reproduce in isolation. Seems like the relation is
getting infected by some previous usage.

This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.