[DRE-commits] [ruby-liquid] 01/03: Merge tag 'upstream/3.0.4'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-liquid.

commit ddd7e2a4ec7725666388a84c8a69eb968416a962
Merge: ab9255a 4b08137
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jul 23 22:33:50 2015 +0200

    Merge tag 'upstream/3.0.4'
    
    Upstream version 3.0.4
    
    # gpg: Signature made jeu. 23 juil. 2015 22:33:49 CEST
    # gpg:                using RSA key 0x89AF82B739CD217A
    # gpg: Good signature from "Cédric Boutillier <boutil at debian.org>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at upmc.fr>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at polytechnique.org>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at gmail.com>" [ultimate]
    # Primary key fingerprint: 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #      Subkey fingerprint: 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 lib/liquid/parser.rb            | 2 +-
 lib/liquid/version.rb           | 2 +-
 metadata.yml                    | 6 +++---
 test/integration/output_test.rb | 8 ++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

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