Merge branch 'master' into stable
Merge branch 'release-v3.3.0' into stable
Merge branch 'release-v3.4.0' into stable
Merge branch 'release-v3.5.0' into stable
Merge branch 'release-v3.5.1' into stable
Get notified about other watched things than issues #1216

When I select "only for things I watch or am involved in" as my Email
notifications setting, I want to get notified about everyhing I watch,
not just issues. The previous setting would only notify me about issues
I'm involved in, now I will additionally be notified about everything I watch.
Bump Rails version to 2.3.16 #1219
Remove Rails patches which are already included in Rails 2.3.16 #1219
Update Changelog for v3.6.0
Bump version to v3.6.0
Merge branch 'release-v3.6.0' into stable
Merge tag 'v3.6.0' into backbone.ws