Change mimetype to Mime::JS if JSONP is used
fixed test case test_render_json_with_callback to use content_type application/javascript
JSON: Encode infinite or NaN floats as null to generate valid JSON.
When a route references a missing controller, raise ActionController::RoutingError with a clearer message
Fixes bug with schema dumper when using with Padrino.
From @dasch's recommendation.
Test polymorphic record with optimistic locking and counter cache should be destoyed without catching the ActiveRecord::StaleObjectError.
Merge branch 'master' of git://github.com/rails/rails
Fix ActiveResource JSON error parser and incorrect tests
Add a missing require for 'active_support/deprecation' in Module#deprecate
Merge branch 'master' of git://github.com/rails/rails
Not checking for nil is apparently a lot faster.
Merge branch 'master' of git://github.com/rails/rails
Merge branch 'master' of git://github.com/rails/rails
Fixed DataMapper namings in symbols and constants.
Added test for setting of HTTP Date header when calling #expires_in
Added accessor methods for Date header
Ensuring a HTTP Date header when setting Cache-Control's max-age with #expires_in
Remove j alias for ERB::Util.json_escape
AS::Callbacks::Callback refactor

In order to make Callbacks code always operate on valid peaces of code
Concatenated Callback#start and Callback#end method into #apply
method.