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

[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 1033f89ab44ecb7d3eea1dd705a8b47044ef6c89
Merge: 85c5839 c4ba750
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 20 00:34:27 2017 +0200

    Merge tag 'upstream/2.12.4'
    
    Upstream version 2.12.4

 CHANGELOG.md          | 11 +++++++++++
 doc/intro.rst         |  9 ++++++---
 lib/osmium.cc         |  1 +
 src/osmium/version.py |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

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