[DRE-commits] [nanoc] 01/04: Merge tag 'upstream/3.7.1'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit 5253bae75da4dbe1c3fb1461dd9bbbff8ecc181c
Merge: d8870d8 0ffda50
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 16 22:01:53 2014 +0200

    Merge tag 'upstream/3.7.1'
    
    Upstream version 3.7.1
    
    # gpg: Signature faite le lun. 16 juin 2014 22:01:50 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> »

 Gemfile.lock         |   2 +-
 NEWS.md              |   6 ++++++
 bin/nanoc            |   6 +++++-
 checksums.yaml.gz    | Bin 270 -> 269 bytes
 lib/nanoc/version.rb |   2 +-
 metadata.yml         |   4 ++--
 6 files changed, 15 insertions(+), 5 deletions(-)

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