[pyosmium] 02/06: Merge tag 'upstream/2.13.0'

[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 6024e3d44b2b319edcafb25a8c47e2376df76a5a
Merge: 21afb3f 3a9ac3a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 31 23:40:28 2017 +0200

    Merge tag 'upstream/2.13.0'
    
    Upstream version 2.13.0

 .travis.yml                      |  19 +++-
 CHANGELOG.md                     |  39 ++++---
 README.md                        |   2 +-
 appveyor.yml                     |   4 +-
 lib/generic_handler.hpp          |  14 +--
 lib/merged_input.hpp             |  42 ++++++-
 lib/osm.cc                       |  22 +++-
 lib/osmium.cc                    |  10 +-
 src/osmium/osm/__init__.py       |  56 ++++++++++
 src/osmium/replication/server.py |  19 +++-
 src/osmium/version.py            |   6 +-
 test/helpers.py                  |  38 ++++++-
 test/test_geom.py                |  23 +++-
 test/test_nodelist.py            |   1 +
 test/test_osm.py                 |  23 ++--
 test/test_replication.py         | 229 +++++++++++++++++++++++++++++++++++++++
 test/test_taglist.py             |   3 +-
 tools/pyosmium-get-changes       |   3 +
 18 files changed, 489 insertions(+), 64 deletions(-)

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