[DRE-commits] [ruby-markerb] 02/08: Merge tag 'upstream/1.0.2'

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

commit a31ac0869710284627194f5d32397904c6c0a1ed
Merge: e0c6f84 1bae50e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Oct 6 00:44:30 2014 +0200

    Merge tag 'upstream/1.0.2'
    
    Upstream version 1.0.2
    
    # gpg: Signature faite le lun. 06 oct. 2014 00:44:27 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                                       |  18 +++
 CHANGELOG.md                                      |   6 +
 Gemfile                                           |   4 +-
 Gemfile.lock                                      | 134 +++++++++++-----------
 MIT-LICENSE                                       |   2 +-
 README.md                                         |   4 +-
 gemfiles/Gemfile-rails.3.2.x                      |   4 +
 gemfiles/Gemfile-rails.4.0.x                      |   4 +
 lib/generators/markerb/mailer/mailer_generator.rb |   6 +-
 lib/markerb.rb                                    |   1 +
 lib/markerb/version.rb                            |   2 +-
 markerb.gemspec                                   |  26 ++---
 metadata.yml                                      |  92 ---------------
 test/generator_test.rb                            |   2 +-
 test/test_helper.rb                               |   5 +-
 15 files changed, 129 insertions(+), 181 deletions(-)

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