Remove unused require in activerecord/test/cases/attribute_methods_test.rb

Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)

Don't refer to ActionController::Base in the wrap_parameters initializer - use config object instead. Cuts about 15% off the load time. (#734)

Delegate expl

Unused variable removed.

Need to include public_send

Split up the definitions in Module#delegate depending on :allow_nil, and don't use exceptions for flow control in the :allow_nil => true case.

Fix private methods which are delegated to. This previously worked because Module#delegate previously ignored method visibility.

Just do the method call directly in Module#delegate, if we can (we cannot for method names ending in '='). Two reasons: 1) it's faster, see https://gist.github.com/1089783 and 2) more importantly, delegate should not allow you to accidentally call private or protected methods.

Backport Object#public_send to 1.8 so that we can implement Module#delegate such that non-public methods raise

Methods like status and location are interfering with redirect_to [Closes #2511]

Conflicts:
	RELEASING_RAILS.rdoc
	actionpack/lib/sprockets/railtie.rb
	actionpack/test/template/sprockets_helper_test.rb
	activerecord/test/cases/calculations_test.rb
	railties/guides/source/3_1_release_notes.textile
	railties/guides/source/active_resource_basics.textile
	railties/guides/source/command_line.textile