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

[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 6f2b89e6353e04e7945f77641010a9a44362085c
Merge: b40738f beca64e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon May 19 12:20:43 2014 -0300

    Merge tag 'upstream/2.12.1'
    
    Upstream version 2.12.1
    
    # gpg: Signature made Seg 19 Mai 2014 12:20:38 BRT 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>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 README.md                         |  13 ++
 checksums.yaml.gz                 | Bin 0 -> 272 bytes
 lib/sprockets/asset_attributes.rb |   1 +
 lib/sprockets/base.rb             |   2 +-
 lib/sprockets/manifest.rb         |   2 +-
 lib/sprockets/sass_importer.rb    |  17 +-
 lib/sprockets/sass_template.rb    |  12 +-
 lib/sprockets/version.rb          |   2 +-
 metadata.yml                      | 459 ++++++++++++++++++--------------------
 9 files changed, 249 insertions(+), 259 deletions(-)

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