[DRE-commits] [ruby-stamp] 01/06: Merge tag 'upstream/0.6.0'

[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-stamp.

commit 5232bababcb7d2663fb02bb7ec9596f3cd4ab952
Merge: 77ebae3 de78a41
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 30 21:11:18 2014 +0200

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    # gpg: Signature faite le mar. 30 sept. 2014 21:11:14 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .travis.yml                     |   3 +-
 Gemfile                         |   2 +-
 checksums.yaml.gz               | Bin 0 -> 268 bytes
 features/stamp.feature          |  16 ++------
 lib/stamp.rb                    |  14 +++----
 lib/stamp/disambiguator.rb      |  23 +++++++++++
 lib/stamp/emitters/ambiguous.rb |  24 +++++++++++
 lib/stamp/emitters/composite.rb |  33 ++++++++++-----
 lib/stamp/translator.rb         |  89 +++++++++++++++++-----------------------
 lib/stamp/version.rb            |   2 +-
 metadata.yml                    |  44 ++++++++------------
 stamp.gemspec                   |   2 +-
 12 files changed, 139 insertions(+), 113 deletions(-)

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