[DRE-commits] [ruby-sinatra] 01/03: Merge tag 'upstream/1.4.6'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-sinatra.

commit 71040ef22b30b324175d9b763ef3b5f753216eaa
Merge: 21f74e3 5e3a9e6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 3 15:19:47 2015 +0530

    Merge tag 'upstream/1.4.6'
    
    Upstream version 1.4.6
    
    # gpg: Signature made Friday 03 April 2015 03:19:42 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"

 AUTHORS                        |   61 ---
 AUTHORS.md                     |   77 +++
 CHANGES                        |   30 ++
 Gemfile                        |   10 +-
 README.de.md                   |  242 ++++++---
 README.es.md                   |  152 +++---
 README.fr.md                   |  176 ++++---
 README.hu.md                   |   38 +-
 README.ja.md                   |   90 ++--
 README.ko.md                   |  230 ++++++---
 README.md                      |  278 ++++++-----
 README.pt-br.md                | 1049 ++++++++++++++++++++++++++++++++++------
 README.pt-pt.md                |   34 +-
 README.ru.md                   |  140 ++++--
 README.zh.md                   |  144 +++---
 checksums.yaml.gz              |  Bin 270 -> 0 bytes
 lib/sinatra.rb                 |    1 -
 lib/sinatra/base.rb            |   36 +-
 lib/sinatra/show_exceptions.rb |   14 +-
 lib/sinatra/version.rb         |    2 +-
 metadata.yml                   |   21 +-
 sinatra.gemspec                |    2 +-
 test/asciidoctor_test.rb       |    4 +-
 test/base_test.rb              |    6 +-
 test/builder_test.rb           |    4 +-
 test/coffee_test.rb            |   10 +-
 test/compile_test.rb           |    2 +-
 test/contest.rb                |   15 +-
 test/creole_test.rb            |    4 +-
 test/delegator_test.rb         |    2 +-
 test/encoding_test.rb          |    2 +-
 test/erb_test.rb               |    2 +-
 test/extensions_test.rb        |    2 +-
 test/filter_test.rb            |    4 +-
 test/haml_test.rb              |    4 +-
 test/helper.rb                 |   15 +-
 test/helpers_test.rb           |   12 +-
 test/integration_test.rb       |    6 +-
 test/less_test.rb              |    4 +-
 test/liquid_test.rb            |    6 +-
 test/mapped_error_test.rb      |   10 +-
 test/markaby_test.rb           |    4 +-
 test/markdown_test.rb          |    9 +-
 test/mediawiki_test.rb         |    4 +-
 test/middleware_test.rb        |    2 +-
 test/nokogiri_test.rb          |    4 +-
 test/rabl_test.rb              |    4 +-
 test/rack_test.rb              |    2 +-
 test/radius_test.rb            |    4 +-
 test/rdoc_test.rb              |    8 +-
 test/readme_test.rb            |    2 +-
 test/request_test.rb           |    5 +-
 test/response_test.rb          |    2 +-
 test/result_test.rb            |    4 +-
 test/route_added_hook_test.rb  |    2 +-
 test/routing_test.rb           |   14 +-
 test/sass_test.rb              |    6 +-
 test/scss_test.rb              |    4 +-
 test/server_test.rb            |   12 +-
 test/settings_test.rb          |    8 +-
 test/sinatra_test.rb           |    2 +-
 test/slim_test.rb              |    4 +-
 test/static_test.rb            |    4 +-
 test/streaming_test.rb         |    4 +-
 test/stylus_test.rb            |    4 +-
 test/templates_test.rb         |    6 +-
 test/textile_test.rb           |    4 +-
 test/wlang_test.rb             |    2 +-
 test/yajl_test.rb              |    4 +-
 69 files changed, 2128 insertions(+), 947 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sinatra.git