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

[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 c5597b6781091e14688b8098d76d8ca580213b6b
Merge: 61d30bd b5afa8d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Nov 7 01:10:33 2015 +0100

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2

 CHANGELOG.md                     | 11 ++++++++++-
 CMakeLists.txt                   |  3 ++-
 include/osmium/diff_iterator.hpp | 21 +++++++++------------
 include/osmium/io/writer.hpp     |  2 +-
 include/osmium/thread/queue.hpp  |  9 ++++++++-
 5 files changed, 30 insertions(+), 16 deletions(-)

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