[DRE-commits] [ruby-sinatra-contrib] 03/05: Merge tag 'upstream/1.4.1'

[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-contrib.

commit 9b3168ff43c27b19de8c66c0d0d168c0fb88ea95
Merge: ebe7a92 a53ecce
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Aug 29 12:22:46 2013 +0200

    Merge tag 'upstream/1.4.1'
    
    Upstream version 1.4.1

 README.md                      |    5 ++
 Rakefile                       |    1 -
 checksums.yaml.gz              |  Bin 0 -> 428 bytes
 lib/sinatra/contrib/version.rb |    2 +-
 lib/sinatra/json.rb            |    7 +--
 lib/sinatra/respond_with.rb    |    6 +--
 lib/sinatra/streaming.rb       |   24 ---------
 metadata.yml                   |  113 +++++++++++++++++++++++++++-------------
 sinatra-contrib.gemspec        |   80 +++++++++++++++++++++++++---
 spec/content_for/footer.erb    |    3 ++
 spec/content_for/footer.erubis |    3 ++
 spec/content_for/footer.haml   |    2 +
 spec/content_for/footer.slim   |    2 +
 spec/json_spec.rb              |    1 -
 spec/respond_with/baz.yajl     |    1 +
 spec/respond_with_spec.rb      |   17 ++++++
 spec/spec_helper.rb            |    2 +-
 spec/streaming_spec.rb         |   21 --------
 18 files changed, 191 insertions(+), 99 deletions(-)

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