[libosmium] 03/07: Merge tag 'upstream/2.11.2'

[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 9870db05711e568fa2f0b823357df9cabc13307a
Merge: 9224956 6bbec29
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed May 3 18:39:31 2017 +0200

    Merge tag 'upstream/2.11.2'
    
    Upstream version 2.11.2

 CHANGELOG.md                         | 10 +++++++++-
 CMakeLists.txt                       |  2 +-
 include/osmium/memory/buffer.hpp     | 15 ++++++++++++---
 include/osmium/version.hpp           |  4 ++--
 test/t/memory/test_buffer_basics.cpp | 19 +++++++++++++++++--
 5 files changed, 41 insertions(+), 9 deletions(-)

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