[DRE-commits] [ruby-sprockets] 01/02: Merge tag 'upstream/2.12.3'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-sprockets.

commit 7bdb3d75cf7943f3f12651a0c59e88412e40d8aa
Merge: 6a7e044 b8509f2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 14 16:17:41 2014 -0200

    Merge tag 'upstream/2.12.3'
    
    Upstream version 2.12.3
    
    # gpg: Signature made Sex 14 Nov 2014 16:17:39 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 README.md                       |  11 ++++++
 checksums.yaml.gz               | Bin 272 -> 0 bytes
 lib/sprockets/base.rb           |   2 +-
 lib/sprockets/sass_functions.rb |  28 ++++++-------
 lib/sprockets/sass_importer.rb  |   2 +-
 lib/sprockets/server.rb         |  14 +++----
 lib/sprockets/version.rb        |   2 +-
 metadata.yml                    |  85 ++++++++++++++++++++--------------------
 8 files changed, 77 insertions(+), 67 deletions(-)

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