[libosmium] 03/05: Merge tag 'upstream/2.11.1'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libosmium.

commit 54348e8b7a9d7bb8c10c48f62eaf2595e6326dc6
Merge: 0180817 03ce3d9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 7 18:26:04 2017 +0100

    Merge tag 'upstream/2.11.1'
    
    Upstream version 2.11.1

 CHANGELOG.md                                  | 14 +++++++++++---
 CMakeLists.txt                                |  2 +-
 include/osmium/builder/builder.hpp            | 18 +++++++++++++++++-
 include/osmium/builder/osm_object_builder.hpp | 20 +++++++++++---------
 include/osmium/io/reader.hpp                  |  8 +++++---
 include/osmium/tags/filter.hpp                |  2 +-
 include/osmium/version.hpp                    |  4 ++--
 test/CMakeLists.txt                           |  1 +
 test/t/io/test_reader_fileformat.cpp          | 10 ++++++++++
 9 files changed, 59 insertions(+), 20 deletions(-)

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