[DRE-commits] [ruby-sass-rails] 01/07: Merge tag 'upstream/4.0.4'

[Praveen Arimbrathodiyil]

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

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

commit 63faf35a24387916517b17e1fde32fad2dc956d1
Merge: da76308 11bd268
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Nov 20 00:56:55 2014 +0530

    Merge tag 'upstream/4.0.4'
    
    Upstream version 4.0.4
    
    # gpg: Signature made Thursday 20 November 2014 12:56:49 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"

 .travis.yml                      |   3 +-
 CHANGELOG.md                     |   5 +
 Rakefile                         |   1 -
 checksums.yaml.gz                | Bin 268 -> 0 bytes
 lib/sass/rails/version.rb        |   2 +-
 metadata.yml                     | 243 +++------------------------------------
 sass-rails.gemspec               |   7 +-
 sass-rails.gemspec.erb           |   5 +-
 test/gemfiles/Gemfile-4-0-stable |   9 ++
 test/gemfiles/Gemfile-4-1-stable |   9 ++
 test/gemfiles/Gemfile-master     |   8 --
 11 files changed, 44 insertions(+), 248 deletions(-)

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