[DRE-commits] [nanoc] 01/02: Merge tag 'upstream/4.3.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 nanoc.

commit aed3c7a91204640b33d18b436719e97b4c8db49f
Merge: 4bf0860 7950d0d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Oct 6 22:01:05 2016 +0200

    Merge tag 'upstream/4.3.4'
    
    Upstream version 4.3.4
    
    # gpg: Signature faite le jeu. 06 oct. 2016 22:01:04 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 Gemfile.lock                                   | 56 +++++++++++++-------------
 NEWS.md                                        | 19 ++++++++-
 lib/nanoc/base/compilation/compiler.rb         | 15 +++++++
 lib/nanoc/base/feature.rb                      | 16 ++++++--
 lib/nanoc/base/services/notification_center.rb |  7 ++++
 lib/nanoc/cli.rb                               |  8 +++-
 lib/nanoc/cli/commands/compile.rb              | 17 +-------
 lib/nanoc/cli/commands/create-site.rb          |  2 +-
 lib/nanoc/cli/commands/deploy.rb               | 16 ++++++--
 lib/nanoc/extra/pruner.rb                      |  2 +
 lib/nanoc/version.rb                           |  2 +-
 test/filters/test_relativize_paths.rb          |  8 ++--
 12 files changed, 108 insertions(+), 60 deletions(-)

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