[DRE-commits] [ruby-sinatra] 02/09: Merge tag 'upstream/1.4.3'

[Jérémy Bobbio]

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

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

commit 85be4a29c849fdd3874597000c9b425ef40cd194
Merge: a5bd970 02e04e3
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Jun 23 18:35:45 2013 +0200

    Merge tag 'upstream/1.4.3'
    
    Upstream version 1.4.3

 AUTHORS                        |   11 +-
 CHANGES                        |  231 ++++
 Gemfile                        |   41 +-
 README.de.md                   | 2865 +++++++++++++++++++++++++++++++++++++++
 README.de.rdoc                 | 1961 ---------------------------
 README.es.md                   | 2779 ++++++++++++++++++++++++++++++++++++++
 README.es.rdoc                 | 2043 ----------------------------
 README.fr.md                   | 2630 ++++++++++++++++++++++++++++++++++++
 README.fr.rdoc                 | 1983 ---------------------------
 README.hu.rdoc => README.hu.md |  255 ++--
 README.jp.md                   | 1097 +++++++++++++++
 README.jp.rdoc                 | 1043 ---------------
 README.ko.md                   | 2489 ++++++++++++++++++++++++++++++++++
 README.md                      | 2878 ++++++++++++++++++++++++++++++++++++++++
 README.pt-br.md                |  954 +++++++++++++
 README.pt-br.rdoc              |  647 ---------
 README.pt-pt.md                |  791 +++++++++++
 README.pt-pt.rdoc              |  646 ---------
 README.rdoc                    | 1979 ---------------------------
 README.ru.md                   | 2724 +++++++++++++++++++++++++++++++++++++
 README.ru.rdoc                 | 1785 -------------------------
 README.zh.md                   | 2139 +++++++++++++++++++++++++++++
 README.zh.rdoc                 | 1816 -------------------------
 Rakefile                       |   26 +-
 checksums.yaml.gz              |  Bin 0 -> 268 bytes
 examples/chat.rb               |   16 +-
 lib/sinatra.rb                 |    3 -
 lib/sinatra/base.rb            |  937 ++++++++-----
 lib/sinatra/main.rb            |   10 +-
 lib/sinatra/showexceptions.rb  |    7 +-
 lib/sinatra/version.rb         |    2 +-
 metadata.yml                   |  130 +-
 sinatra.gemspec                |    8 +-
 test/base_test.rb              |   30 +-
 test/builder_test.rb           |   34 +-
 test/coffee_test.rb            |   10 +-
 test/compile_test.rb           |  183 +++
 test/contest.rb                |   10 +-
 test/creole_test.rb            |   10 +-
 test/delegator_test.rb         |    8 +-
 test/erb_test.rb               |   52 +-
 test/extensions_test.rb        |    4 +-
 test/filter_test.rb            |  179 ++-
 test/haml_test.rb              |   60 +-
 test/helper.rb                 |    8 +
 test/helpers_test.rb           |  577 ++++----
 test/integration/app.rb        |   58 +-
 test/integration_helper.rb     |  227 ++++
 test/integration_test.rb       |  123 +-
 test/less_test.rb              |   18 +-
 test/liquid_test.rb            |   26 +-
 test/mapped_error_test.rb      |  218 +--
 test/markaby_test.rb           |   10 +-
 test/markdown_test.rb          |   15 +-
 test/middleware_test.rb        |    6 +-
 test/nokogiri_test.rb          |   10 +-
 test/rabl_test.rb              |   89 ++
 test/radius_test.rb            |    8 +-
 test/rdoc_test.rb              |   14 +-
 test/readme_test.rb            |   54 +-
 test/request_test.rb           |   30 +-
 test/response_test.rb          |   12 +-
 test/result_test.rb            |   44 +-
 test/route_added_hook_test.rb  |   20 +-
 test/routing_test.rb           |  331 ++++-
 test/sass_test.rb              |   53 +-
 test/scss_test.rb              |   33 +-
 test/server_test.rb            |    4 +-
 test/settings_test.rb          |   52 +-
 test/sinatra_test.rb           |    9 +-
 test/slim_test.rb              |   60 +-
 test/static_test.rb            |   72 +-
 test/streaming_test.rb         |   44 +-
 test/stylus_test.rb            |   90 ++
 test/templates_test.rb         |  163 ++-
 test/textile_test.rb           |   18 +-
 test/views/hello.rabl          |    2 +
 test/views/hello.styl          |    2 +
 test/views/hello.wlang         |    1 +
 test/views/hello.yajl          |    1 +
 test/views/layout2.rabl        |    3 +
 test/views/layout2.wlang       |    2 +
 test/wlang_test.rb             |   87 ++
 test/yajl_test.rb              |   86 ++
 84 files changed, 24975 insertions(+), 15211 deletions(-)

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