[pyosmium] 02/04: Merge tag 'upstream/2.12.3'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 996af672718916d5b46af964f9a9c6e945f1dacb
Merge: 6db620c 3ccb706
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 26 22:17:21 2017 +0200

    Merge tag 'upstream/2.12.3'
    
    Upstream version 2.12.3

 CHANGELOG.md               | 16 +++++++++++++++-
 README.md                  |  9 ++++++++-
 README.rst                 | 10 ++++++++--
 lib/generic_handler.hpp    | 25 ++++++++++++++++---------
 lib/merged_input.hpp       |  1 +
 lib/osmium.cc              |  5 +++++
 src/osmium/version.py      |  2 +-
 tools/pyosmium-get-changes |  4 ++--
 8 files changed, 56 insertions(+), 16 deletions(-)

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