[libosmium] 02/04: Merge tag 'upstream/2.6.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libosmium.

commit 892a492048c45ee8105ebcab561ef2e3f8935d0c
Merge: f7dafe8 e770995
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 25 09:25:06 2016 +0100

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1

 CHANGELOG.md                                    |  19 ++-
 CMakeLists.txt                                  |   9 +-
 examples/osmium_area_test.cpp                   |  12 +-
 include/osmium/area/assembler.hpp               |  30 ++--
 include/osmium/area/detail/proto_ring.hpp       |   8 +
 include/osmium/area/detail/segment_list.hpp     |  27 +++-
 include/osmium/io/detail/pbf_output_format.hpp  |  55 +++----
 include/osmium/io/detail/protobuf_tags.hpp      |   2 +-
 include/osmium/relations/collector.hpp          |  95 ++++++-----
 include/osmium/relations/detail/member_meta.hpp |  15 --
 include/osmium/util/iterator.hpp                |  74 +++++++++
 include/osmium/util/memory.hpp                  |   6 +-
 include/protozero/config.hpp                    |   4 +-
 include/protozero/exception.hpp                 |   8 +-
 include/protozero/pbf_builder.hpp               |  14 +-
 include/protozero/pbf_message.hpp               |   2 +-
 include/protozero/pbf_reader.hpp                |  40 +++--
 include/protozero/pbf_writer.hpp                | 202 ++++++++++++++++++++++--
 include/protozero/{pbf_types.hpp => types.hpp}  |   8 +-
 include/protozero/varint.hpp                    |   4 +-
 include/protozero/version.hpp                   |   6 +-
 test/t/basic/test_node_ref.cpp                  |  52 ++++++
 22 files changed, 517 insertions(+), 175 deletions(-)

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