Bump Rails version to 2.3.15 #1200
Remove Rails patches which are already included in Rails 2.3.15 #1200
Update Changelog for v3.5.0
Bump version to v3.5.0
Merge branch 'master' into unstable