Merge pull request #337 from yb66/master

readme update, condition with multiple values
activate jruby on travis
Merge branch 'master' of github.com:sinatra/sinatra
fix teapot example
Updating Gemfile to include gems that now also work on MagLev.
Merge pull request #339 from timfel/master

Gemfile update for MagLev
add #stream helper
Merge branch 'master' of github.com:sinatra/sinatra
make sure route returns the signature
205 no longer sends a body, as per RFC 2616
make extending Stream with mixins easier
Revert "make extending Stream with mixins easier"

This reverts commit 962d3f549ec6b7a2adbbee8438f03b28cdf80d6f.
load jruby-openssl when testing on jruby
Slight changes to wording regarding caching.
use 303 for redirects from post for HTTP/1.1 (fixes ajax redirects in Internet Explorer 9)
205 no longer returns a body on rack master
update changes (1.3.0)
update changes (1.2.7)
doc condition with multiple args in Spanish readme
doc stream helper in Spanish readme