…sing proxies Conflicts: lib/sinatra/base.rb test/delegator_test.rb
…245 Conflicts: lib/sinatra/base.rb test/delegator_test.rb
…makes sessions usable out of the box with shotgun)
…n), fixes #236 Conflicts: CHANGES
…atibility, fixes #231
…tly in `content_type` (example: `content_type "text/plain; charset=utf-16"`).