[DRE-commits] [ruby-haml] 01/04: Merge tag 'upstream/4.0.6'

[Praveen Arimbrathodiyil]

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

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

commit 7fea561ffdf52d7b0695f21ea0d7fb1c84aa8d0f
Merge: 1564faf 2964d59
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 10:30:50 2015 +0530

    Merge tag 'upstream/4.0.6'
    
    Upstream version 4.0.6
    
    # gpg: Signature made Saturday 29 August 2015 10:30:46 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 CHANGELOG.md                           |   8 ++-
 checksums.yaml.gz                      | Bin 270 -> 0 bytes
 lib/haml/parser.rb                     |   2 +-
 lib/haml/temple.rb                     |  85 ---------------------------
 lib/haml/version.rb                    |   2 +-
 metadata.yml                           |   8 +--
 test/gemfiles/Gemfile.rails-4.0.x.lock | 101 ---------------------------------
 test/helper_test.rb                    |  21 ++++---
 test/test_helper.rb                    |   4 --
 9 files changed, 22 insertions(+), 209 deletions(-)

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