Merge branch 'master' of github.com:rails/rails

SQLite: forward compatibility with future driver releases

[rails#4633]

Signed-off-by: Jeremy Kemper <[email protected]>

2.3.7 release: fix rails_xss compatibility

2.3.6 release

Merge branch 'master' of github.com:rails/rails

Merge branch 'master' of github.com:rails/rails

Release is today, yo

Release is today, yo

Bump git versions to 3.0.0.beta1 since we've released

Ruby on Rails 2.3.5

* Improved Ruby 1.9 Support
* Compatible with the rails_xss plugin
* Fixes a bug with filtered parameter logs
* Numerous fixes to Active Record's nested attributes functionality
* Fixes to ActiveResource to be slightly more flexible when handling response content types.
* Fixes for the Nokogiri backend for XmlMini