[protozero] 02/04: Merge tag 'upstream/1.4.2'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository protozero.

commit 4cb6fb79e58e55dc4920525e83f9c627b10cc815
Merge: 7a53711 09609b2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 27 09:56:29 2016 +0200

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2

 CHANGELOG.md                    | 16 +++++++++++++---
 CONTRIBUTING.md                 |  6 +++++-
 Makefile                        |  2 +-
 include/protozero/iterators.hpp | 10 +++++-----
 include/protozero/version.hpp   |  4 ++--
 package.json                    |  2 +-
 6 files changed, 27 insertions(+), 13 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/protozero.git