[DRE-commits] [ruby-coffee-rails] 01/06: Merge tag 'upstream/4.0.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-coffee-rails.

commit 9fdfe9392c9f2882e71537c49348d7aa410da853
Merge: 3e58307 1c2abe3
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 27 11:56:07 2014 -0300

    Merge tag 'upstream/4.0.1'
    
    Upstream version 4.0.1
    
    # gpg: Signature made Dom 27 Jul 2014 11:56:00 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>"

 .gitignore                                         |   1 +
 .travis.yml                                        |  17 +--
 CHANGELOG.md                                       |  36 ++++++
 Gemfile                                            |   9 +-
 README.markdown => README.md                       |  10 +-
 Rakefile                                           |  16 +++
 checksums.yaml.gz                                  | Bin 0 -> 269 bytes
 coffee-rails.gemspec                               |  15 +--
 coffee-rails.gemspec.erb                           |  24 ++++
 gemfiles/Gemfile-4-0-stable                        |   5 +
 lib/coffee/rails/version.rb                        |   2 +-
 .../coffee/assets/templates/javascript.js.coffee   |   2 +-
 metadata.yml                                       | 138 +++++++++------------
 test/assets_test.rb                                |   3 +-
 test/test_helper.rb                                |   1 +
 15 files changed, 178 insertions(+), 101 deletions(-)

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