[libosmium] 02/04: Merge tag 'upstream/2.11.4' into stretch

[Bas Couwenberg]

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

sebastic pushed a commit to branch stretch
in repository libosmium.

commit 34cb225037d310df44c4c6cb4aad67c25ee13bb3
Merge: c02fd7d 28b1885
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 26 15:04:17 2017 +0200

    Merge tag 'upstream/2.11.4' into stretch
    
    Upstream version 2.11.4

 CHANGELOG.md                    |  8 ++++++++
 CMakeLists.txt                  |  2 +-
 include/osmium/memory/item.hpp  |  3 ++-
 include/osmium/osm/location.hpp |  7 +++++++
 include/osmium/version.hpp      |  4 ++--
 test/t/osm/test_location.cpp    | 16 ++++++++++++++++
 6 files changed, 36 insertions(+), 4 deletions(-)

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