[DRE-commits] [ruby-sinatra] 01/05: Merge tag 'upstream/1.4.7'

[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 afa0e8e88a184f1974502231230143dd492262e5
Merge: d812873 03b025a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Feb 23 20:43:37 2016 +0530

    Merge tag 'upstream/1.4.7'
    
    Upstream version 1.4.7
    
    # gpg: Signature made Tuesday 23 February 2016 08:43:31 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>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 AUTHORS.md                     |    7 +-
 CHANGES => CHANGELOG.md        |   18 +-
 CONTRIBUTING.md                |  100 ++
 LICENSE                        |    4 +-
 README.de.md                   |  119 +-
 README.es.md                   |  365 ++---
 README.fr.md                   |  702 ++++-----
 README.hu.md                   |   14 +-
 README.ja.md                   |  366 ++---
 README.ko.md                   |  405 ++---
 README.md                      |  397 ++---
 README.pt-br.md                |  258 ++--
 README.pt-pt.md                |  126 +-
 README.ru.md                   |  193 ++-
 README.zh.md                   | 3176 ++++++++++++++++++++++++----------------
 Rakefile                       |    4 +-
 lib/sinatra/base.rb            |   40 +-
 lib/sinatra/ext.rb             |   17 +
 lib/sinatra/show_exceptions.rb |   20 +-
 lib/sinatra/version.rb         |    2 +-
 metadata.yml                   |   15 +-
 sinatra.gemspec                |    2 +-
 test/public/hello+world.txt    |    1 +
 test/routing_test.rb           |   44 +
 test/static_test.rb            |   30 +
 25 files changed, 3854 insertions(+), 2571 deletions(-)

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