Added plain text stack trace output if a cURL user agent is detected.
allow 1.9 modes on jruby and rbx to fail
add README.ko.rdoc for Korean translation
Merge pull request #493 from sjoonk/master

Sinatra README Korean translation
Modified showexceptions.rb to obey HTTP ACCEPT handlers
Merge pull request #494 from jaseg/showexceptions_accept_headers

Showexceptions accept headers
Merge branch 'master' of github.com:sinatra/sinatra
adding version mismatch attention message
Merge pull request #498 from sjoonk/master

Adding the attention line right below the Sinatra headline
do not encourage disabling protection
allowing a sequence of error blocks with the same http status code to be chained
Add note about disabling protection to readme.fr
Merge pull request #506 from snaggled/master

Issue #467 Make #pass Behave as Expected in Error Blocks
Merge pull request #507 from GordonDiggs/master

Update French README to include latest changes
sometimes puma does not log in test mode
be smarter about servers
let use_code default to false, remove warning. fixes #497
wrap sinatra stack for nicer handling, fixes #496
add mizuno
add first class support for trinidad, fixes #482