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

commit 2eadedcbdf9fc8dca54d7372b43fc9544786222d
Merge: 5253bae 44bc3d6
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 21 14:35:41 2014 +0200

    Merge tag 'upstream/3.7.2'
    
    Upstream version 3.7.2
    
    # gpg: Signature faite le jeu. 21 août 2014 14:35:36 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                                        |  17 +++++++++++++++--
 bin/nanoc                                      |   1 +
 checksums.yaml.gz                              | Bin 269 -> 269 bytes
 lib/nanoc/base/compilation/rules_collection.rb |   8 ++++----
 lib/nanoc/data_sources/filesystem.rb           |   6 ++++--
 lib/nanoc/data_sources/filesystem_unified.rb   |   2 +-
 lib/nanoc/extra/auto_compiler.rb               |   2 +-
 lib/nanoc/extra/chick.rb                       |   8 ++++----
 lib/nanoc/filters/kramdown.rb                  |   2 +-
 lib/nanoc/filters/markaby.rb                   |   2 +-
 lib/nanoc/filters/maruku.rb                    |   2 +-
 lib/nanoc/filters/rdoc.rb                      |   2 +-
 lib/nanoc/version.rb                           |   2 +-
 metadata.yml                                   |   4 ++--
 test/data_sources/test_filesystem.rb           |  14 +++++++-------
 test/data_sources/test_filesystem_unified.rb   |  12 +++++-------
 test/data_sources/test_filesystem_verbose.rb   |   6 +++---
 test/helpers/test_rendering.rb                 |   8 ++++----
 19 files changed, 57 insertions(+), 43 deletions(-)

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