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

Rails version 2.2.3

Addresses CVE-2009-3009, a timing weakness in the cookie store and multiple bug fixes

Includes fixes for CVE2009-3009 and the timing weakness in ActiveSupp…

…ort::MessageVerifier

Forgot to bump the railties versions

Release version 2.3.3

Bug Fixes and minor feature additions.

Try to use actionpack gem to generate guide when Rails is not vendored